OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge "Bump version for OtaDexoptService" am: de1a963e52
Mathieu Chartier [Thu, 8 Mar 2018 18:32:35 +0000 (18:32 +0000)]
Merge "Bump version for OtaDexoptService" am: de1a963e52
am: 28e42ede83

Change-Id: Ib55b5ebb685fc8b91e31dfb9b5d99a9e6c0c0cb7

6 years agoMerge "Add new 'explicit GC' policy to StrictMode." am: 121eb58ab4
Pete Gillin [Thu, 8 Mar 2018 18:24:20 +0000 (18:24 +0000)]
Merge "Add new 'explicit GC' policy to StrictMode." am: 121eb58ab4
am: bed18a9888  -s ours

Change-Id: I091b0497cb507c20e5a2392f16edc997faf5222a

6 years agoMerge "Bump version for OtaDexoptService"
Mathieu Chartier [Thu, 8 Mar 2018 18:12:54 +0000 (18:12 +0000)]
Merge "Bump version for OtaDexoptService"
am: de1a963e52

Change-Id: I49beb8aabbae6a4a06d1a9c360bdcefd47a5b187

6 years agoMerge "Synchronize all WindowTestsBase and WindowTestUtils methods." into pi-dev
Chavi Weingarten [Thu, 8 Mar 2018 17:38:55 +0000 (17:38 +0000)]
Merge "Synchronize all WindowTestsBase and WindowTestUtils methods." into pi-dev
am: 5f6980af6e

Change-Id: I9f04085a6050e5df822ee3e64c1682d6fff064cc

6 years agoMerge "Synchronize all WindowTestsBase and WindowTestUtils methods." into pi-dev
Chavi Weingarten [Thu, 8 Mar 2018 17:26:31 +0000 (17:26 +0000)]
Merge "Synchronize all WindowTestsBase and WindowTestUtils methods." into pi-dev

6 years agoMerge "Bump version for OtaDexoptService"
Mathieu Chartier [Thu, 8 Mar 2018 17:07:15 +0000 (17:07 +0000)]
Merge "Bump version for OtaDexoptService"

6 years agoMerge "Tag @SystemApi to ambient brightness stats API" into pi-dev
Peeyush Agarwal [Thu, 8 Mar 2018 16:10:51 +0000 (16:10 +0000)]
Merge "Tag @SystemApi to ambient brightness stats API" into pi-dev
am: 9a2857d927

Change-Id: Id5d1003e81427ccf6a4d93928a250ce67dc454ac

6 years agoMerge "Tag @SystemApi to ambient brightness stats API" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 15:59:50 +0000 (15:59 +0000)]
Merge "Tag @SystemApi to ambient brightness stats API" into pi-dev

6 years agoMerge "Add permission check to setAllowOnlyVpnForUids" into pi-dev
Rubin Xu [Thu, 8 Mar 2018 15:52:38 +0000 (15:52 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids" into pi-dev
am: 269357aa0e

Change-Id: If86e9905a38bf505b601bef6ae09c60fb76d4d4c

6 years agoMerge "ParceledListSlice shouldn't be created with null" into pi-dev
Peeyush Agarwal [Thu, 8 Mar 2018 15:42:19 +0000 (15:42 +0000)]
Merge "ParceledListSlice shouldn't be created with null" into pi-dev
am: 6279c5ab6e

Change-Id: I87d7381370a0b5e140768d1080481619b16438f7

6 years agoMerge "Add permission check to setAllowOnlyVpnForUids" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 15:38:18 +0000 (15:38 +0000)]
Merge "Add permission check to setAllowOnlyVpnForUids" into pi-dev

6 years agoMerge "ParceledListSlice shouldn't be created with null" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 15:28:11 +0000 (15:28 +0000)]
Merge "ParceledListSlice shouldn't be created with null" into pi-dev

6 years agoMerge "Remove registerSliceCallback and formalize setCallerNeeded" into pi-dev
Jason Monk [Thu, 8 Mar 2018 15:20:29 +0000 (15:20 +0000)]
Merge "Remove registerSliceCallback and formalize setCallerNeeded" into pi-dev
am: 8d15ff047d

Change-Id: If8eb4ea7aafcbf926fbcd62465c2606c36d08840

6 years agoMerge "Global actions visuals - color and ordering changes." into pi-dev
Alison Cichowlas [Thu, 8 Mar 2018 15:14:12 +0000 (15:14 +0000)]
Merge "Global actions visuals - color and ordering changes." into pi-dev
am: 4a28bbaf8f

Change-Id: Iaec9b64d1807c0ee692d5de1b4b51328b391343a

6 years agoMerge "Remove registerSliceCallback and formalize setCallerNeeded" into pi-dev
Jason Monk [Thu, 8 Mar 2018 15:02:26 +0000 (15:02 +0000)]
Merge "Remove registerSliceCallback and formalize setCallerNeeded" into pi-dev

6 years agoMerge "Global actions visuals - color and ordering changes." into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 15:01:46 +0000 (15:01 +0000)]
Merge "Global actions visuals - color and ordering changes." into pi-dev

6 years agoMerge "Ringer state is saved when zen mode is off" into pi-dev
Beverly Tai [Thu, 8 Mar 2018 14:29:28 +0000 (14:29 +0000)]
Merge "Ringer state is saved when zen mode is off" into pi-dev
am: db66bede99

Change-Id: I8749bd95d1ae319e3940f3695f0436a4e714db8b

6 years agoMerge "Ringer state is saved when zen mode is off" into pi-dev
Beverly Tai [Thu, 8 Mar 2018 14:14:19 +0000 (14:14 +0000)]
Merge "Ringer state is saved when zen mode is off" into pi-dev

6 years agoMerge "Use proper start op overload in all places" into pi-dev
Svet Ganov [Thu, 8 Mar 2018 14:12:17 +0000 (14:12 +0000)]
Merge "Use proper start op overload in all places" into pi-dev
am: 0b7bdb0cc1

Change-Id: Ief60b4bcae1ecf6385428cb5e56b112e1fcffd60

6 years agoMerge "Use proper start op overload in all places" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 13:59:28 +0000 (13:59 +0000)]
Merge "Use proper start op overload in all places" into pi-dev

6 years agoMerge "Add new 'explicit GC' policy to StrictMode."
Pete Gillin [Thu, 8 Mar 2018 12:51:56 +0000 (12:51 +0000)]
Merge "Add new 'explicit GC' policy to StrictMode."
am: 121eb58ab4

Change-Id: Ice5b3c97fb7a791b2623df8e2de6c2669b920b19

6 years agoMerge "Make MediaPlaylistAgent updatable" into pi-dev
Sungsoo Lim [Thu, 8 Mar 2018 12:21:48 +0000 (12:21 +0000)]
Merge "Make MediaPlaylistAgent updatable" into pi-dev
am: 5f0fb0c8fa

Change-Id: Iab33d111da5758eab78e9969dfd40645b4cbc91c

6 years agoMerge "Make MediaPlaylistAgent updatable" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 12:08:47 +0000 (12:08 +0000)]
Merge "Make MediaPlaylistAgent updatable" into pi-dev

6 years agoMerge "VideoView2: Remove setRouteAttributes" into pi-dev
Sungsoo Lim [Thu, 8 Mar 2018 10:55:20 +0000 (10:55 +0000)]
Merge "VideoView2: Remove setRouteAttributes" into pi-dev
am: 3bfe2b15b8

Change-Id: I6b28292df62f6062c948eb9b02fba15ddb73b4de

6 years agoMerge "Add new 'explicit GC' policy to StrictMode."
Pete Gillin [Thu, 8 Mar 2018 10:55:00 +0000 (10:55 +0000)]
Merge "Add new 'explicit GC' policy to StrictMode."

6 years agoMerge "VideoView2: Remove setRouteAttributes" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 10:34:29 +0000 (10:34 +0000)]
Merge "VideoView2: Remove setRouteAttributes" into pi-dev

6 years agoAdd permission check to setAllowOnlyVpnForUids
Rubin Xu [Thu, 11 Jan 2018 10:59:19 +0000 (10:59 +0000)]
Add permission check to setAllowOnlyVpnForUids

Bug: 63000005
Test: runtest frameworks-net -c com.android.server.connectivity.VpnTest
Test: cts-tradefed run cts-dev -m CtsDevicePolicyManagerTestCases -t com.android.cts.devicepolicy.MixedDeviceOwnerTest#testAlwaysOnVpnLockDown
Change-Id: Ia1a82ee73d8617f3124032986fe6c09c14bf7752

6 years agoMerge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev
Jaewan Kim [Thu, 8 Mar 2018 09:11:07 +0000 (09:11 +0000)]
Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev
am: c23ee7639b

Change-Id: I7d8aabd832402dcdeab5b35daebb5a4a8477617b

6 years agoMerge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev
Jaewan Kim [Thu, 8 Mar 2018 08:56:50 +0000 (08:56 +0000)]
Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev

6 years agoMerge "pm: Modify getPackage() to only return non-null packages" into pi-dev
Jeffrey Vander Stoep [Thu, 8 Mar 2018 08:40:51 +0000 (08:40 +0000)]
Merge "pm: Modify getPackage() to only return non-null packages" into pi-dev
am: b1464cd4f8

Change-Id: I8b071e4d053ba61485fa853906d73c957570f5f3

6 years agoMake MediaPlaylistAgent updatable
Sungsoo Lim [Thu, 8 Mar 2018 06:14:34 +0000 (15:14 +0900)]
Make MediaPlaylistAgent updatable

Bug: 74366050
Test: build
Change-Id: Iea8e4d9b6a11393bd837da90394d95529fdbe5eb

6 years agoMerge "pm: Modify getPackage() to only return non-null packages" into pi-dev
Jeffrey Vander Stoep [Thu, 8 Mar 2018 08:27:44 +0000 (08:27 +0000)]
Merge "pm: Modify getPackage() to only return non-null packages" into pi-dev

6 years agoDisable LTO temporarily for hwui
Pirama Arumuga Nainar [Thu, 8 Mar 2018 07:42:03 +0000 (07:42 +0000)]
Disable LTO temporarily for hwui
am: 7184e28b3a

Change-Id: Ie5d0f88bdb8fdc162842b6e79299088b1498f01a

6 years agoDisable LTO temporarily for hwui
Pirama Arumuga Nainar [Thu, 8 Mar 2018 07:24:02 +0000 (23:24 -0800)]
Disable LTO temporarily for hwui

Bug: http://b/62839002

LTO does not seem to interact well with PGO profile-file updates and
incremental builds in the build servers.

Test: build
Change-Id: I42175b2376b374d00ec169d4fe8d84cd938b21e5

6 years agoUse proper start op overload in all places
Svet Ganov [Thu, 8 Mar 2018 05:40:28 +0000 (21:40 -0800)]
Use proper start op overload in all places

Test: issued a sequences of app ops that led to a crash
      and after the fix this sequence no longer causes
      a crash

bug: 74209446

Change-Id: I5064b51387ed98e42743ed94ef92114944f28761

6 years agoVideoView2: Remove setRouteAttributes
Sungsoo Lim [Mon, 26 Feb 2018 12:01:56 +0000 (21:01 +0900)]
VideoView2: Remove setRouteAttributes

Being consistent, create route player internally and do not expose it
since VideoView2 creats a MediaPlayer inside and do not expose it.

Bug: 72527212
Test: manually with VideoViewTest
Change-Id: I6db3bc668f6ab77587fed49b2d34611bc3c30465

6 years agoMediaSession2: Clean up TODOs under frameworks/base
Jaewan Kim [Thu, 8 Mar 2018 01:47:00 +0000 (10:47 +0900)]
MediaSession2: Clean up TODOs under frameworks/base

This change includes
  - Addressed trivial TODOs (takes less than 1min)
  - Renamed playlist controller to playlist agent
  - Renamed mplc to playlistAgent
  - Renamed mpb to player
  - Assigned buganizer issues for TODOs

Bug: 74361045
Test: Run MediaComponentsTest
Change-Id: I45e97081b5a3f24988c3daadd007edcb51be5288

6 years agoMerge "Statsd cpu optimizaton" into pi-dev
Yangster [Thu, 8 Mar 2018 04:22:00 +0000 (04:22 +0000)]
Merge "Statsd cpu optimizaton" into pi-dev
am: 641eb554fd

Change-Id: I22895fafa08049386824f3bae9d43647b48ffa03

6 years agoMerge "Show app ops guts when tap app ops icons" into pi-dev
Julia Reynolds [Thu, 8 Mar 2018 04:16:25 +0000 (04:16 +0000)]
Merge "Show app ops guts when tap app ops icons" into pi-dev
am: 7b894b3fcd

Change-Id: Ib61f338fe0ea723c1a3a500902cf200227d2db9a

6 years agoMerge "Tapping overview button when quickstep enabled shows overview" into pi-dev
Matthew Ng [Thu, 8 Mar 2018 04:07:18 +0000 (04:07 +0000)]
Merge "Tapping overview button when quickstep enabled shows overview" into pi-dev
am: 8b4b86981c

Change-Id: I0bf0edfad1ecef51aeed6294d3625a647860e333

6 years agoMerge "Statsd cpu optimizaton" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 04:03:19 +0000 (04:03 +0000)]
Merge "Statsd cpu optimizaton" into pi-dev

6 years agoMerge "Show app ops guts when tap app ops icons" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 04:00:37 +0000 (04:00 +0000)]
Merge "Show app ops guts when tap app ops icons" into pi-dev

6 years agoMerge "Tapping overview button when quickstep enabled shows overview" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 03:51:17 +0000 (03:51 +0000)]
Merge "Tapping overview button when quickstep enabled shows overview" into pi-dev

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
Bill Yi [Thu, 8 Mar 2018 03:06:07 +0000 (03:06 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
am: 284bccf702  -s ours

Change-Id: I942128b7b3ef80831b11bf340d8d70e746ba2294

6 years agoMerge "Import translations. DO NOT MERGE" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 02:58:27 +0000 (02:58 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev

6 years agoMerge "Dumping stack traces to proto." into pi-dev
Kweku Adams [Thu, 8 Mar 2018 02:41:23 +0000 (02:41 +0000)]
Merge "Dumping stack traces to proto." into pi-dev
am: 09ed26a046

Change-Id: I549bdaa5f38cf0bb5a630cecf20b10eb35295120

6 years agoMerge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev
Jean-Michel Trivi [Thu, 8 Mar 2018 02:33:11 +0000 (02:33 +0000)]
Merge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev
am: 56055c0bb4

Change-Id: I13e7bb5017914bc3cc2b4113083fb406c137e11f

6 years agoMerge "Fix accessibility action parceling" into pi-dev
Phil Weaver [Thu, 8 Mar 2018 02:25:00 +0000 (02:25 +0000)]
Merge "Fix accessibility action parceling" into pi-dev
am: fc0c8d9b63

Change-Id: Ia8ef042191e3e1abbb4a45d2c31f41cbb802edab

6 years agoMerge "Do not depend on task activities decrementing with finish." into pi-dev
Bryce Lee [Thu, 8 Mar 2018 01:59:04 +0000 (01:59 +0000)]
Merge "Do not depend on task activities decrementing with finish." into pi-dev
am: e42057b1f1

Change-Id: I616fcea5a3067f7018c17890f631ad9672f07f91

6 years agoMerge "Dumping stack traces to proto." into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 01:55:13 +0000 (01:55 +0000)]
Merge "Dumping stack traces to proto." into pi-dev

6 years agoMerge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 01:54:50 +0000 (01:54 +0000)]
Merge "AudioFormat: java-native conversion for xHE-AAC" into pi-dev

6 years agoMerge "Fix accessibility action parceling" into pi-dev
Phil Weaver [Thu, 8 Mar 2018 01:49:43 +0000 (01:49 +0000)]
Merge "Fix accessibility action parceling" into pi-dev

6 years agoTapping overview button when quickstep enabled shows overview
Matthew Ng [Thu, 1 Mar 2018 21:21:43 +0000 (13:21 -0800)]
Tapping overview button when quickstep enabled shows overview

This is the systemui side of showing launcher's overview when it decides
to allow users to trigger overview with the overview button in the
navigation bar when quickstep is enabled.

Test: manual - tap overview button in nav bar
Bug: 67957962
Change-Id: I0d59d60d4b4ce1df9dcf2a745f9a5efd415b8582

6 years agoShow app ops guts when tap app ops icons
Julia Reynolds [Wed, 28 Feb 2018 21:31:35 +0000 (16:31 -0500)]
Show app ops guts when tap app ops icons

Test: runtest systemui
Bug: 64085448
Change-Id: Ia51044f77311ab705ffb9dd1ae204d0131316396

6 years agoMerge "Add colorProgressBackgroundNormal" into pi-dev
Andrew Sapperstein [Thu, 8 Mar 2018 01:42:02 +0000 (01:42 +0000)]
Merge "Add colorProgressBackgroundNormal" into pi-dev
am: 62ff4029e4

Change-Id: If2325c1acff1ebaf1ec88a7e4278ecfc73a8aa7a

6 years agoMerge "Do not depend on task activities decrementing with finish." into pi-dev
Bryce Lee [Thu, 8 Mar 2018 01:40:13 +0000 (01:40 +0000)]
Merge "Do not depend on task activities decrementing with finish." into pi-dev

6 years agoStatsd cpu optimizaton
Yangster [Thu, 8 Mar 2018 01:30:49 +0000 (17:30 -0800)]
Statsd cpu optimizaton

- cache the changed dimensions in condition tracker.
- avoid query condition wizard when unnecessary.
- avoid copy dimension keys in condition key generation.

Test: statsd tests.

BUG: b/73959649
Change-Id: I17d68e2a82643de3f421309841e75f84c6fd8f43

6 years agoMerge "Implement front-end support for HAL 2.0 metadata." into pi-dev
Tomasz Wasilczyk [Thu, 8 Mar 2018 01:33:27 +0000 (01:33 +0000)]
Merge "Implement front-end support for HAL 2.0 metadata." into pi-dev
am: 71b71dada7

Change-Id: Ia6f5dedecdd7530c0df106cf24942eae958d832f

6 years agoMerge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev
Mikhail Naganov [Thu, 8 Mar 2018 01:25:16 +0000 (01:25 +0000)]
Merge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev
am: 43a7980fc6

Change-Id: I1d2f8e01a73575b1c0e9e167b910787cbc9fdb01

6 years agoMerge "Initialize mWcdmaRscpAsu and fix invalid value for asu" am: 36886b6f15
Jordan Liu [Thu, 8 Mar 2018 01:20:27 +0000 (01:20 +0000)]
Merge "Initialize mWcdmaRscpAsu and fix invalid value for asu" am: 36886b6f15
am: 0c345309bf

Change-Id: Ieed1d385da08c5e06ea2cafe076d84522af5cf8d

6 years agoMerge "Add colorProgressBackgroundNormal" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 01:07:31 +0000 (01:07 +0000)]
Merge "Add colorProgressBackgroundNormal" into pi-dev

6 years agoMerge "Initialize mWcdmaRscpAsu and fix invalid value for asu"
Jordan Liu [Thu, 8 Mar 2018 01:04:53 +0000 (01:04 +0000)]
Merge "Initialize mWcdmaRscpAsu and fix invalid value for asu"
am: 36886b6f15

Change-Id: Ie5bf6391fc967283cd705cb9437ba302649a48c8

6 years agoMerge "Refactor cpu stats pullers" into pi-dev
Chenjie Yu [Thu, 8 Mar 2018 00:59:08 +0000 (00:59 +0000)]
Merge "Refactor cpu stats pullers" into pi-dev
am: c8a6305ddf

Change-Id: Ic2a8f3c017a57e76f3e820d29c539c5bc99db51f

6 years agoMerge "Show system uptime in bugreport (dumpsys alarm)" into pi-dev
Makoto Onuki [Thu, 8 Mar 2018 00:50:09 +0000 (00:50 +0000)]
Merge "Show system uptime in bugreport (dumpsys alarm)" into pi-dev
am: e840cc4eca

Change-Id: Ib6e06deda43707df24d92947ee728a710333af43

6 years agoMerge "Fix NPE if app context is null" into pi-dev
John Reck [Thu, 8 Mar 2018 00:47:15 +0000 (00:47 +0000)]
Merge "Fix NPE if app context is null" into pi-dev
am: a08a8569bf

Change-Id: I64ad0cbfa7e30cf298ba7e658cf0edab1e14630f

6 years agoMerge "Implement front-end support for HAL 2.0 metadata." into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 00:46:08 +0000 (00:46 +0000)]
Merge "Implement front-end support for HAL 2.0 metadata." into pi-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 7 Mar 2018 22:30:57 +0000 (14:30 -0800)]
Import translations. DO NOT MERGE

BUG:72647570

Change-Id: I1f9e429f8742e81b310a026d0504967f9726f9b4
Auto-generated-cl: translation import

6 years agoMerge "Verify the content length in the verity digest" into pi-dev
Victor Hsieh [Thu, 8 Mar 2018 00:43:44 +0000 (00:43 +0000)]
Merge "Verify the content length in the verity digest" into pi-dev
am: 429a58d18b

Change-Id: Ie061a13e802232fe4f036730436cdc847210931b

6 years agoMerge "Don't consume all BACK keys in SearchView" into pi-dev
Evan Rosky [Thu, 8 Mar 2018 00:40:17 +0000 (00:40 +0000)]
Merge "Don't consume all BACK keys in SearchView" into pi-dev
am: a1aa6abe36

Change-Id: Iea6535861725fea6096d9c44409436b8207594f0

6 years agoMerge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 00:34:40 +0000 (00:34 +0000)]
Merge "AudioFormat: Uncomment conversion for EAC3-JOC" into pi-dev

6 years agoMerge "Refactor cpu stats pullers" into pi-dev
Chenjie Yu [Thu, 8 Mar 2018 00:24:00 +0000 (00:24 +0000)]
Merge "Refactor cpu stats pullers" into pi-dev

6 years agoMerge "Show system uptime in bugreport (dumpsys alarm)" into pi-dev
Makoto Onuki [Thu, 8 Mar 2018 00:23:34 +0000 (00:23 +0000)]
Merge "Show system uptime in bugreport (dumpsys alarm)" into pi-dev

6 years agoMerge "Setting the alpha on the full bitmap for AdaptiveIcon instead of individual...
Sunny Goyal [Thu, 8 Mar 2018 00:22:58 +0000 (00:22 +0000)]
Merge "Setting the alpha on the full bitmap for AdaptiveIcon instead of individual layers" into pi-dev
am: b577d00c35

Change-Id: Ice438827995061615a45c1d071e2b67a89c6f1c7

6 years agoMerge "Fix NPE if app context is null" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 00:15:22 +0000 (00:15 +0000)]
Merge "Fix NPE if app context is null" into pi-dev

6 years agoMerge "Verify the content length in the verity digest" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 00:15:18 +0000 (00:15 +0000)]
Merge "Verify the content length in the verity digest" into pi-dev

6 years agoMerge "Don't consume all BACK keys in SearchView" into pi-dev
TreeHugger Robot [Thu, 8 Mar 2018 00:13:43 +0000 (00:13 +0000)]
Merge "Don't consume all BACK keys in SearchView" into pi-dev

6 years agoMerge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into...
Chong Zhang [Thu, 8 Mar 2018 00:10:59 +0000 (00:10 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev am: 5d2153d17c am: 2d0e5b6acc  -s ours am: c551f11cd6  -s ours
am: 2da6c9aa8b

Change-Id: I2973f86d5be3795c59a996abe4a33e14e7c14e72

6 years agoMerge "Don't store lockout deadline in lockSettings" into pi-dev
Kevin Chyn [Thu, 8 Mar 2018 00:04:14 +0000 (00:04 +0000)]
Merge "Don't store lockout deadline in lockSettings" into pi-dev
am: 7f8967e3ce

Change-Id: Iaf18d8a35e412225466c805323e5878f279d1853

6 years agoMerge "Setting the alpha on the full bitmap for AdaptiveIcon instead of individual...
TreeHugger Robot [Wed, 7 Mar 2018 23:58:24 +0000 (23:58 +0000)]
Merge "Setting the alpha on the full bitmap for AdaptiveIcon instead of individual layers" into pi-dev

6 years agoMerge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into...
Chong Zhang [Wed, 7 Mar 2018 23:44:55 +0000 (23:44 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev am: 5d2153d17c am: 2d0e5b6acc  -s ours
am: c551f11cd6  -s ours

Change-Id: Id5ade2438e3a4716ca4ac69fa11438169dd2e763

6 years agoMerge "Initialize mWcdmaRscpAsu and fix invalid value for asu"
Jordan Liu [Wed, 7 Mar 2018 23:41:41 +0000 (23:41 +0000)]
Merge "Initialize mWcdmaRscpAsu and fix invalid value for asu"

6 years agoMerge "Don't store lockout deadline in lockSettings" into pi-dev
TreeHugger Robot [Wed, 7 Mar 2018 23:41:32 +0000 (23:41 +0000)]
Merge "Don't store lockout deadline in lockSettings" into pi-dev

6 years agoMerge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into...
Chong Zhang [Wed, 7 Mar 2018 23:39:11 +0000 (23:39 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev am: 5d2153d17c
am: 2d0e5b6acc  -s ours

Change-Id: I231859f9e26c99ae3a34241842e50f4d44d23f93

6 years agoMerge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into...
Chong Zhang [Wed, 7 Mar 2018 23:17:01 +0000 (23:17 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev
am: 5d2153d17c

Change-Id: I04e026a96e1899ba9496979561df5680297f546a

6 years agoMerge "Window: Provide frame size hint to ViewRootImpl" into pi-dev
Adrian Roos [Wed, 7 Mar 2018 23:15:23 +0000 (23:15 +0000)]
Merge "Window: Provide frame size hint to ViewRootImpl" into pi-dev
am: b8d853732c

Change-Id: I1382753d3e7fd1104b9e31e1b358413e3fc8f5dd

6 years agoMerge "Merge "Apply prior tint to rotate icon on recreation" into pi-dev am: a42585c3...
Android Build Merger (Role) [Wed, 7 Mar 2018 23:10:50 +0000 (23:10 +0000)]
Merge "Merge "Apply prior tint to rotate icon on recreation" into pi-dev am: a42585c349" into pi-dev-plus-aosp

6 years agoMerge "Apply prior tint to rotate icon on recreation" into pi-dev
Mike Digman [Wed, 7 Mar 2018 23:10:25 +0000 (23:10 +0000)]
Merge "Apply prior tint to rotate icon on recreation" into pi-dev
am: a42585c349

Change-Id: Ia1262a8596d7bae614d60a52904a6a5e97c93883

6 years agoMerge "Minor clean-up in NetworkCapabilities" am: 539f85a18d
Pavel Maltsev [Wed, 7 Mar 2018 23:09:04 +0000 (23:09 +0000)]
Merge "Minor clean-up in NetworkCapabilities" am: 539f85a18d
am: b1e2bfe4df

Change-Id: Ie6839576f61563f2a82fec53afc42208f5a37f3c

6 years agoMerge "Improve a11y pane title javadoc" into pi-dev
Phil Weaver [Wed, 7 Mar 2018 23:05:02 +0000 (23:05 +0000)]
Merge "Improve a11y pane title javadoc" into pi-dev
am: f397f44756

Change-Id: I77920f9e4ab3d220fd374c75b1572f6eda67dbc6

6 years agoAudioFormat: java-native conversion for xHE-AAC
Jean-Michel Trivi [Wed, 7 Mar 2018 23:02:44 +0000 (15:02 -0800)]
AudioFormat: java-native conversion for xHE-AAC

Bug: 71430241
Test: only once we have decoder
Change-Id: Ifab4e887d1516da45eed762a8a4d92c3b8f1f95c

6 years agoMerge "Minor clean-up in NetworkCapabilities"
Pavel Maltsev [Wed, 7 Mar 2018 23:00:53 +0000 (23:00 +0000)]
Merge "Minor clean-up in NetworkCapabilities"
am: 539f85a18d

Change-Id: Ic70f545a4886461f38f1af934600f4e1afe0179f

6 years agoMerge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into...
Chong Zhang [Wed, 7 Mar 2018 22:59:15 +0000 (22:59 +0000)]
Merge "Fix mismatch in parcel read/write in ParcelableCasData -- DO NOT MERGE" into oc-dev

6 years agoMerge "Window: Provide frame size hint to ViewRootImpl" into pi-dev
Adrian Roos [Wed, 7 Mar 2018 22:58:34 +0000 (22:58 +0000)]
Merge "Window: Provide frame size hint to ViewRootImpl" into pi-dev

6 years agoMerge "Screenshots broken for activities with dialog themes" into pi-dev
Adrian Roos [Wed, 7 Mar 2018 22:55:08 +0000 (22:55 +0000)]
Merge "Screenshots broken for activities with dialog themes" into pi-dev
am: a52ddd989e

Change-Id: I9ac4407f9fd30edd7ba53120d65e16df9264bc2c

6 years agoGlobal actions visuals - color and ordering changes.
Alison Cichowlas [Wed, 7 Mar 2018 00:48:06 +0000 (19:48 -0500)]
Global actions visuals - color and ordering changes.

Test: Manual, with light & dark themes
Bug: 72404596

Change-Id: I739035d8a2824af801e2a5a1bbb8541594d43267

6 years agoMerge "Revert "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion...
Jeff Vander Stoep [Wed, 7 Mar 2018 22:48:08 +0000 (22:48 +0000)]
Merge "Revert "Revert "pm: SharedUserId: Assign seinfo using actual targetSdkVersion""" into pi-dev
am: ac01b4533c

Change-Id: I82ead401fb298bdc0ffc595c2bfb0d95a2aba081

6 years agoMerge "Apply prior tint to rotate icon on recreation" into pi-dev
Mike Digman [Wed, 7 Mar 2018 22:47:40 +0000 (22:47 +0000)]
Merge "Apply prior tint to rotate icon on recreation" into pi-dev

6 years agoApply prior tint to rotate icon on recreation
Mike Digman [Tue, 6 Mar 2018 21:08:33 +0000 (13:08 -0800)]
Apply prior tint to rotate icon on recreation

In very rare circumstances, it's possible for the rotate icon
to be recreated but not have the dark intensity set. Fix this
by applying prior icon's intensity.

Test: manual but heisenbug so very hard to validate
Fixes: 74354524
Change-Id: I042de35e725794b04f5250fa3a2fc5a54d65d143

6 years agoAdd colorProgressBackgroundNormal
Andrew Sapperstein [Tue, 27 Feb 2018 20:52:17 +0000 (12:52 -0800)]
Add colorProgressBackgroundNormal

Adds new private theme attr colorProgressBackgroundNormal which
the default material/devicedefault progress/seekbar backgrounds
use for their background tint.

Added default values for Material/DeviceDefault themes. Material's
is colorControlNormal.

Adds a new config_progress_background_tint color resource that OEMs can
overlay. Default value is colorControlNormal since AOSP should not
change the tint. OEMs who wish to change the default can simply
overlay config_progress_background_tint with their preferred color.

Finally, deletes the unnecessary control_nodisable_material which
was just a layer of indirection pointing to colorControlNormal.

Bug: 69314526
Test: ag/3665368
Change-Id: I6443e08469677cdf31d99c73966b437e5a1f2472

6 years agoMerge "Improve a11y pane title javadoc" into pi-dev
Phil Weaver [Wed, 7 Mar 2018 22:38:07 +0000 (22:38 +0000)]
Merge "Improve a11y pane title javadoc" into pi-dev