OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Storage API polishing." into oc-dev
Jeff Sharkey [Mon, 17 Apr 2017 22:39:20 +0000 (22:39 +0000)]
Merge "Storage API polishing." into oc-dev
am: 200d72d933

Change-Id: I1ad134599ee095628dcc7fe1da28bda40a1863f4

7 years agoMerge "AOD: Track missed AOD time ticks" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 22:27:47 +0000 (22:27 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev
am: e7b581bca9

Change-Id: I72825244a16f4d88e8acd1e69e045859ef3a8acc

7 years agoMerge "Storage API polishing." into oc-dev
Jeff Sharkey [Mon, 17 Apr 2017 22:26:35 +0000 (22:26 +0000)]
Merge "Storage API polishing." into oc-dev

7 years agoMerge "Fix date going missing in QS" into oc-dev
Jason Monk [Mon, 17 Apr 2017 22:26:20 +0000 (22:26 +0000)]
Merge "Fix date going missing in QS" into oc-dev
am: ff9a2790b7

Change-Id: I88a31aad238ec5ca67b816cb6deb4e5f311536e1

7 years agoMerge "AOD: Track missed AOD time ticks" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 22:16:16 +0000 (22:16 +0000)]
Merge "AOD: Track missed AOD time ticks" into oc-dev

7 years agoMerge "Fix date going missing in QS" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 22:06:05 +0000 (22:06 +0000)]
Merge "Fix date going missing in QS" into oc-dev

7 years agoMerge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
Jesse Hall [Mon, 17 Apr 2017 21:55:21 +0000 (21:55 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
am: 16338a4450

Change-Id: I1a9ee4e54834e340eef6216e55bae7c6aaba0f73

7 years agoMerge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev
Jesse Hall [Mon, 17 Apr 2017 21:52:20 +0000 (21:52 +0000)]
Merge "Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle" into oc-dev

7 years agoMerge "Add tests for ag/2086796" into oc-dev
Mike Tsao [Mon, 17 Apr 2017 21:52:02 +0000 (21:52 +0000)]
Merge "Add tests for ag/2086796" into oc-dev
am: 7c31e7924c

Change-Id: Ibe9266f7aa1f378a9e1868c927e3f28e2e2cb090

7 years agoMerge "Add tests for ag/2086796" into oc-dev
Mike Tsao [Mon, 17 Apr 2017 21:46:32 +0000 (21:46 +0000)]
Merge "Add tests for ag/2086796" into oc-dev

7 years agoMerge "Add user to channel/group modification callbacks." into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 21:40:09 +0000 (21:40 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev
am: 1ed2771450

Change-Id: I3ff8b4f15fe7b3d22ef243e3f5379dd3d136a0f7

7 years agoMerge "Add user to channel/group modification callbacks." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 21:26:49 +0000 (21:26 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev

7 years agoMerge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
Winson Chung [Mon, 17 Apr 2017 21:14:14 +0000 (21:14 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
am: 11139e913c

Change-Id: I9b8d45c33bf3e83e7c25f5bafc2f7d90be9d875c

7 years agoMerge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
Todd Lee [Mon, 17 Apr 2017 21:12:59 +0000 (21:12 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
am: c025ea892e

Change-Id: Ifb690a1ac7d9ff2605c88bd4503e06311ef0dd1c

7 years agoMerge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev
Winson Chung [Mon, 17 Apr 2017 21:06:29 +0000 (21:06 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev

7 years agoMerge "Enhance PinItemRequest javadoc" into oc-dev
Makoto Onuki [Mon, 17 Apr 2017 21:03:32 +0000 (21:03 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev
am: 5838563e93

Change-Id: Ie0233a300fe9dc046117602a891679e5f1b00a98

7 years agoMerge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 21:02:43 +0000 (21:02 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev

7 years agoMerge "Allow to finish session when all views are gone" into oc-dev
Philip P. Moltmann [Mon, 17 Apr 2017 21:00:28 +0000 (21:00 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev
am: 3440e92009

Change-Id: I5adf95ccd456818f3858e7c2ee194d126be57f1f

7 years agoMerge "AOD: disable quicksettings while dozing" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 20:58:41 +0000 (20:58 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev
am: 1c4c981c03

Change-Id: Icf289127886daf7eccd383aef18bd155f0d3ec67

7 years agoMerge "Update api for ServiceStateProvider" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 20:56:45 +0000 (20:56 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev
am: 728fbfb7c1

Change-Id: I0b61681780b9337b5b6e36b1aadc23c52199ea08

7 years agoMerge "Enhance PinItemRequest javadoc" into oc-dev
Makoto Onuki [Mon, 17 Apr 2017 20:50:38 +0000 (20:50 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev

7 years agoMerge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
Makoto Onuki [Mon, 17 Apr 2017 20:46:36 +0000 (20:46 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
am: c3fa6ab2ac

Change-Id: Ie67b77c8873b237a82e9ec470e3fcb698d474e3e

7 years agoMerge "Allow to finish session when all views are gone" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:44:57 +0000 (20:44 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev

7 years agoMerge "AOD: disable quicksettings while dozing" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev

7 years agoMerge "Update api for ServiceStateProvider" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 20:37:25 +0000 (20:37 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev

7 years agoMerge "getApplicationInfo() should throw NameNotFoundException" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev

7 years agoMerge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
Aurimas Liutikas [Mon, 17 Apr 2017 20:21:25 +0000 (20:21 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
am: ff4e132cff

Change-Id: I72249172933a83c91c175dd46c96823368a25bda

7 years agoMerge "Enhance Chronometer to better support Swedish countdowns." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:15:16 +0000 (20:15 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev

7 years agoMerge "Camera: Override enableZsl based on SDK version" into oc-dev
Chien-Yu Chen [Mon, 17 Apr 2017 19:58:03 +0000 (19:58 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
am: 3b41407f19

Change-Id: I8399759e0ba6cf31aaa7fb2330272522b6abdf5c

7 years agoMerge "Camera: Override enableZsl based on SDK version" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev

7 years agoAdd tests for ag/2086796
Mike Tsao [Tue, 11 Apr 2017 20:57:31 +0000 (13:57 -0700)]
Add tests for ag/2086796

Fixes: 37192695
Change-Id: Id0b3cbf986490d64cdc5592541dee1b004853503
Test: added
(cherry picked from commit cfe4ffecceee005ff6bc79dcc1637f44f82bd43a)

7 years agoFix date going missing in QS
Jason Monk [Mon, 17 Apr 2017 19:22:30 +0000 (15:22 -0400)]
Fix date going missing in QS

Test: Dismiss alarm while QS is expanded
Change-Id: I491deda22848af08db36dcffcb678f6ce2f1bdda
Fixes: 37259783

7 years agoMerge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
Joe LaPenna [Mon, 17 Apr 2017 19:08:19 +0000 (19:08 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
am: 5b06dbd12b

Change-Id: I29bf802473cd98352390a12120d2bbd9b293f5cf

7 years agoMerge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 19:02:58 +0000 (19:02 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev

7 years agoMerge "ContextHubService: Pass on query requests" into oc-dev
Brian Duddie [Mon, 17 Apr 2017 19:01:57 +0000 (19:01 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev
am: befd33975c

Change-Id: Id27aa1ec7d76e6f74a0f436ba5f8bd1643991f6e

7 years agoMerge changes I22b55b73,Id050f2f5 into oc-dev
Selim Cinek [Mon, 17 Apr 2017 19:00:28 +0000 (19:00 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev
am: d8d7a283bd

Change-Id: Ia147e09d7974c2a4f810ee0df04c602be1760be4

7 years agoMerge "AOD: Fix icon color when updating on AOD" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 18:59:20 +0000 (18:59 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev
am: f0111ce8b6

Change-Id: Ie554c41a43c2a311d217a35fe96a6b81b56ceac6

7 years agoMerge "ContextHubService: Pass on query requests" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 18:51:43 +0000 (18:51 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev

7 years agoMerge changes I22b55b73,Id050f2f5 into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 18:51:01 +0000 (18:51 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev

* changes:
  Only foreground service notifications can be colorized
  Fixed a regression where the scrim would be black

7 years agoMerge "AOD: Fix icon color when updating on AOD" into oc-dev
Adrian Roos [Mon, 17 Apr 2017 18:48:37 +0000 (18:48 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev

7 years agoMerge "Merge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED...
Android Build Merger (Role) [Mon, 17 Apr 2017 18:45:54 +0000 (18:45 +0000)]
Merge "Merge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev am: e15f91276c" into oc-dev-plus-aosp

7 years agoMerge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" into...
Dianne Hackborn [Mon, 17 Apr 2017 18:44:58 +0000 (18:44 +0000)]
Merge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev
am: e15f91276c

Change-Id: Iacccbcc734d5c49f483923c00625a49ad1d280a5

7 years agoMerge "Update api for ServiceStateProvider" am: 286b5f117d am: ea4a67ddd1
Jordan Liu [Mon, 17 Apr 2017 18:44:01 +0000 (18:44 +0000)]
Merge "Update api for ServiceStateProvider" am: 286b5f117d am: ea4a67ddd1
am: 56a13d1bce

Change-Id: I8797fca65daa01ad86118b5f548a800e1854769c

7 years agoMerge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" into...
TreeHugger Robot [Mon, 17 Apr 2017 18:38:57 +0000 (18:38 +0000)]
Merge "Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev

7 years agoAOD: disable quicksettings while dozing
Adrian Roos [Mon, 17 Apr 2017 18:38:16 +0000 (11:38 -0700)]
AOD: disable quicksettings while dozing

Test: Trigger ambient display / AOD, verify quicksettings is not expandable
Bug: 37303800
Change-Id: I694360f4d728ff9714036d0b92176c922ff53e9a

7 years agoMerge "Remove FrameLayout around toolbar" into oc-dev
Fan Zhang [Mon, 17 Apr 2017 18:37:45 +0000 (18:37 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev
am: 46f6e69e1b

Change-Id: I2129c87b83a2346feff73cffcf26a2359f84e197

7 years agoMerge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
Romain Guy [Mon, 17 Apr 2017 18:33:23 +0000 (18:33 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
am: 5b52cf6274

Change-Id: I86284be4dc506b6f4243ae27c4df848d874ca912

7 years agoMerge "Remove FrameLayout around toolbar" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev

7 years agoMerge "Update api for ServiceStateProvider" am: 286b5f117d
Jordan Liu [Mon, 17 Apr 2017 18:21:56 +0000 (18:21 +0000)]
Merge "Update api for ServiceStateProvider" am: 286b5f117d
am: ea4a67ddd1

Change-Id: Ib0ac43e24dbd4b1c0f037f6f3f3bc81b9acbae62

7 years agoMerge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 18:20:10 +0000 (18:20 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev

7 years agoStorage API polishing.
Jeff Sharkey [Sun, 16 Apr 2017 19:18:35 +0000 (13:18 -0600)]
Storage API polishing.

Based on API council feedback, switch to using real UUID objects
instead of Strings.  Since UUID is a general-purpose utility class
that will be passed around quite a bit, add it to Parcel and Bundle.

Define well-known namespaced UUID values for "default" and "primary
physical" storage devices, which will let us annotate a bunch of
things with @NonNull.

Define new extras for MANAGE_STORAGE intent that apps can use to
signal where and how much space they'd like the user to free up.

Test: cts-tradefed run commandAndExit cts-dev -m CtsAppSecurityHostTestCases -t android.appsecurity.cts.StorageHostTest
Bug: 373259233581289935806020
Change-Id: I8421b126d680f69141a361c1e77223fe2bf4a325

7 years agoMerge "Update api for ServiceStateProvider"
Jordan Liu [Mon, 17 Apr 2017 18:14:23 +0000 (18:14 +0000)]
Merge "Update api for ServiceStateProvider"
am: 286b5f117d

Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3

7 years agoUpdate api for ServiceStateProvider
Jordan Liu [Wed, 1 Mar 2017 02:15:07 +0000 (18:15 -0800)]
Update api for ServiceStateProvider

ServiceStateProvider defines public constants in
Telephony.ServiceStateTable so update the api.

Test: flashed onto device locally
Bug: 33756364
Change-Id: I62b6b8bcfdf909aa36e44441f8672f98f581f896
Merged-In: I62b6b8bcfdf909aa36e44441f8672f98f581f896

7 years agoMerge "Update api for ServiceStateProvider"
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"

7 years agoMerge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
Jaewan Kim [Mon, 17 Apr 2017 18:00:26 +0000 (18:00 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
am: bde4eb5bcb

Change-Id: I0b81c971b5b466e967b8255cfc400c780c9078ba

7 years agoMerge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
Tyler Gunn [Mon, 17 Apr 2017 17:58:49 +0000 (17:58 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
am: 790ec07c26

Change-Id: I6f5294d93d11d72b2d14795b22757e68259b0c95

7 years agoMerge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 17:53:15 +0000 (17:53 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev

7 years agoMerge "Don't back up disabled apps" into oc-dev
Chris Tate [Mon, 17 Apr 2017 17:44:18 +0000 (17:44 +0000)]
Merge "Don't back up disabled apps" into oc-dev
am: 628690ea2b

Change-Id: If8008f3c14bdb12dee5e400ce96394e1f541f462

7 years agoMerge "Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe5...
Android Build Merger (Role) [Mon, 17 Apr 2017 17:41:06 +0000 (17:41 +0000)]
Merge "Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661 am: 2dda9f5d66" into oc-dev-plus-aosp

7 years agoMerge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev
Tyler Gunn [Mon, 17 Apr 2017 17:40:44 +0000 (17:40 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev

7 years agoMerge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661
Rebecca Silberstein [Mon, 17 Apr 2017 17:39:55 +0000 (17:39 +0000)]
Merge "WifiManager: add new methods to start softap" am: be2653d41e am: 334fe54661
am: 2dda9f5d66

Change-Id: Ie2476bbae3554bd9fc203c478d25cb2e2898c8e3

7 years agoMerge "Fix EmergencyCryptKeeperText initialization" into oc-dev
Yoshinori Hirano [Mon, 17 Apr 2017 17:39:45 +0000 (17:39 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
am: 1afa1646a2

Change-Id: I2cf920ba553587c4da04a1f1973a15d48c89ed80

7 years agoDO NOT MERGE Expose phone account register/unregister intents.
Tyler Gunn [Fri, 14 Apr 2017 20:43:30 +0000 (13:43 -0700)]
DO NOT MERGE Expose phone account register/unregister intents.

These were previously @SystemApi.  Retaining the existing SystemAPI
behavior which sends the intents to those with a private permission.
Extending to ALSO send these intents to the default dialer app as well
using an explicit intent.
Cherry-pick from aosp-master to resolve merge conflicts.

Test: Manual
Bug: 37106957
Merged-In: Ifb72870105be5ba024af196a8c3165a9afb397ab
Change-Id: Ifb72870105be5ba024af196a8c3165a9afb397ab
(cherry picked from commit d9da6ce9938b4222cfb409f172cacfe4cf1593e6)

7 years agoMerge "Don't back up disabled apps" into oc-dev
Chris Tate [Mon, 17 Apr 2017 17:35:46 +0000 (17:35 +0000)]
Merge "Don't back up disabled apps" into oc-dev

7 years agoMerge "WifiManager: add new methods to start softap" am: be2653d41e
Rebecca Silberstein [Mon, 17 Apr 2017 17:30:08 +0000 (17:30 +0000)]
Merge "WifiManager: add new methods to start softap" am: be2653d41e
am: 334fe54661

Change-Id: I3e0455020c5b0c1896c1994a821832e0e45ae4e6

7 years agoMerge "Fix EmergencyCryptKeeperText initialization" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 17:28:33 +0000 (17:28 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev

7 years agoMerge "WifiManager: add new methods to start softap"
Rebecca Silberstein [Mon, 17 Apr 2017 17:20:42 +0000 (17:20 +0000)]
Merge "WifiManager: add new methods to start softap"
am: be2653d41e

Change-Id: Ic73c0b8f52c86f00a6d03687b37b4c02f41d4fcc

7 years agoMerge "media: Address API review comments" into oc-dev
Hangyu Kuang [Mon, 17 Apr 2017 17:13:17 +0000 (17:13 +0000)]
Merge "media: Address API review comments" into oc-dev
am: ab312729ce

Change-Id: Ie957c8c197ff2459cbc5d32c1716d78d0752ddbe

7 years agoMerge "WifiManager: add new methods to start softap"
Rebecca Silberstein [Mon, 17 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "WifiManager: add new methods to start softap"

7 years agoMerge "Temporary remove resource-display caching" into oc-dev
Andrii Kulian [Mon, 17 Apr 2017 17:08:29 +0000 (17:08 +0000)]
Merge "Temporary remove resource-display caching" into oc-dev
am: 8f4bd67929

Change-Id: I26ead23b26bd5ed50804cb5edf0ca15d10303eb5

7 years agoMerge "Don't allow stacks above pinned stack." into oc-dev
Bryce Lee [Mon, 17 Apr 2017 17:07:09 +0000 (17:07 +0000)]
Merge "Don't allow stacks above pinned stack." into oc-dev
am: 22d4ef008d

Change-Id: I740f62046d5f37a634e8c656ee76a82ecb244ff1

7 years agoMerge "media: Address API review comments" into oc-dev
Hangyu Kuang [Mon, 17 Apr 2017 17:04:17 +0000 (17:04 +0000)]
Merge "media: Address API review comments" into oc-dev

7 years agoMerge "Temporary remove resource-display caching" into oc-dev
Andrii Kulian [Mon, 17 Apr 2017 16:59:56 +0000 (16:59 +0000)]
Merge "Temporary remove resource-display caching" into oc-dev

7 years agoMerge "Don't allow stacks above pinned stack." into oc-dev
Bryce Lee [Mon, 17 Apr 2017 16:57:11 +0000 (16:57 +0000)]
Merge "Don't allow stacks above pinned stack." into oc-dev

7 years agoTemporary remove resource-display caching
Andrii Kulian [Mon, 17 Apr 2017 02:28:02 +0000 (19:28 -0700)]
Temporary remove resource-display caching

An instance of ResourceKey may correspond to different instances
of Resources at different points in time. This can lead to old
instances of Display returned from cache even if resources have
changed.
We need to ensure 1:1 correspondence between Resources and
ResourceKey before using this kind of cache. Disabling it for now
to fix CTS.

Change-Id: Ib53550c4f2d969c06a570ab6051529269b04b38d
Fixes: 37328072
Fixes: 37305567
Bug: 33430498
Test: android.server.cts.ActivityManagerAppConfigurationTests
Test: android.app.cts.DisplayTest#testRotation

7 years agoMerge "Synchronously update APs in during forceUpdate." into oc-dev
Sundeep Ghuman [Mon, 17 Apr 2017 16:42:31 +0000 (16:42 +0000)]
Merge "Synchronously update APs in during forceUpdate." into oc-dev
am: 6bdbc4abec

Change-Id: Ib98d02c5e40de0f245fb303041a665b8ade6a4f3

7 years agoMerge "Synchronously update APs in during forceUpdate." into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 16:34:49 +0000 (16:34 +0000)]
Merge "Synchronously update APs in during forceUpdate." into oc-dev

7 years agoMerge "Also use the notification's sound for the misc channel" into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 16:33:11 +0000 (16:33 +0000)]
Merge "Also use the notification's sound for the misc channel" into oc-dev
am: ed8f49efdc

Change-Id: I268e2702a6fbe714276f38581493ef2a089007e8

7 years agoRemove FrameLayout around toolbar
Fan Zhang [Fri, 14 Apr 2017 19:27:18 +0000 (12:27 -0700)]
Remove FrameLayout around toolbar

The FrameLayout is useless, and cause problems if dev needs to customize
actionbar in code.

Change-Id: Iae6861e1e60576f4b4e175d01c7cd57c0775ecd7
Fix: 37207527
Test: visual

7 years agoEnhance Chronometer to better support Swedish countdowns.
Aurimas Liutikas [Fri, 14 Apr 2017 21:51:59 +0000 (14:51 -0700)]
Enhance Chronometer to better support Swedish countdowns.

Adds a method isTheFinalCountDown that allows to correctly
determine whether it is the final countdown.

Test: None
Change-Id: I786ae3455479bac25ccf25efba1c3dce18185117

7 years agoMerge "Also use the notification's sound for the misc channel" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 16:23:49 +0000 (16:23 +0000)]
Merge "Also use the notification's sound for the misc channel" into oc-dev

7 years agoInclude vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle
Jesse Hall [Mon, 17 Apr 2017 15:54:43 +0000 (08:54 -0700)]
Include vndk/hardware_buffer.h for AHardwareBuffer_getNativeHandle

This function is now VNDK-only, and not in the NDK header.

Bug: 34050596
Test: build
Change-Id: Id0147dbdb65157da9692e7f38b1a068be18be2b9

7 years agoFix EmergencyCryptKeeperText initialization
Yoshinori Hirano [Mon, 10 Apr 2017 11:33:49 +0000 (20:33 +0900)]
Fix EmergencyCryptKeeperText initialization

Moved the initialization to CollapsedStatusBarFragment
because EmergencyCryptKepperText is included in status_bar.xml

Bug: 37198942
Test: visual

Change-Id: I1b87e4857cea7f7b582f7e0f6062b70da98df13a

7 years agoMerge "Remove @removed method" into oc-dev
Julia Reynolds [Mon, 17 Apr 2017 15:09:24 +0000 (15:09 +0000)]
Merge "Remove @removed method" into oc-dev
am: bbcf5fba1c

Change-Id: Iae9bb928a90d172dfe74e9308a6d8283df734dc6

7 years agoMerge "Remove @removed method" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 15:01:46 +0000 (15:01 +0000)]
Merge "Remove @removed method" into oc-dev

7 years agoAlso use the notification's sound for the misc channel
Julia Reynolds [Mon, 17 Apr 2017 14:31:03 +0000 (10:31 -0400)]
Also use the notification's sound for the misc channel

Even if it's nonexistent.

Test: runtest systemui-notification
Change-Id: I1167fdf10b776460de696657dd49ab6f2be85753
Fixes: 37414045

7 years agoMerge "expose the instant app installer component" into oc-dev
Todd Kennedy [Mon, 17 Apr 2017 14:22:35 +0000 (14:22 +0000)]
Merge "expose the instant app installer component" into oc-dev
am: 676590d060

Change-Id: I48c05c84c2afba4bf68dfd42b834d8e6958f6744

7 years agoMerge "expose the instant app installer component" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 14:17:20 +0000 (14:17 +0000)]
Merge "expose the instant app installer component" into oc-dev

7 years agoOEM single-build/multi-SKU via dynamic RRO support
Todd Lee [Thu, 16 Mar 2017 21:00:52 +0000 (14:00 -0700)]
OEM single-build/multi-SKU via dynamic RRO support

The purpose here is to provide support for selectively
enabling Runtime Resource Overlays (RROs) (specifically
those pertaining to a specific SKU, within a OEM's "single
build" covering multiple SKUs) at boot based on the value
of a pre-defined system property.

This mechanism is designed to be compatible with other,
recent changes to Runtime Resource Overlays - specifically:

- has no effect on 'isStatic'. Resource overlays must be
  attributed as static in order to qualify for loading into
  the system_server. The 'requiredSystemPropertyName/
  requiredSystemPropertyValue' mechanism operates
  independent of this and can be used on both static and
  non static overlays. The effect of specifying a conditional
  property on any overlay is that it will ONLY be enabled
  in the event that the system reflects both the property
  and the specified value (Note that in the ABSENCE of a
  conditional property, overlays are assumed to be enabled).

- has no effect on OverlayManagerService (OMS) API. The
  OMS provides the system with an interface through which
  overlays can be enabled/disabled and even rearranged at
  runtime. This provides the basis of support for various
  user-level features (e.g. dynamic theme selection).
  The 'requiredSystemPropertyName/requiredSystemPropertyValue'
  mechanism operates independent of this -
  with enablement being completely coupled to the available
  system properties on the device and NOT subject to change
  at runtime.

Note: as part of this change, original overlay tests have been
updated (fixed) and expanded to include tests to cover the
conditional property implementation.

Issue: http://b/35100249
Test: frameworks/base/core/tests/overlaytests/testrunner.py

Change-Id: I1990ce21a27a385db1e2f53294b69dd03988351e
(cherry picked from commit d5566c6c47faa6b9dda282741e25ac78c9487d58)

7 years agoAdd user to channel/group modification callbacks.
Julia Reynolds [Thu, 13 Apr 2017 19:48:16 +0000 (15:48 -0400)]
Add user to channel/group modification callbacks.

Because listeners can see notifications on managed profiles.

Test: runtest systemui-notification and testing with a sample app
(reading and updating channels and getting change
callbacks on a managed profile)
Change-Id: I5d7af3c417e3a3d18f992cc9ad01fbd7959de398
Fixes: 36783632

7 years agoTV PIP: Remove onboarding activity and overlay activity
Jaewan Kim [Fri, 14 Apr 2017 06:26:20 +0000 (15:26 +0900)]
TV PIP: Remove onboarding activity and overlay activity

Remove both activities until the new OC UX spec is finalized.

Bug: 36370535
Test: Manual test (Checked that onboarding nor overlay activities aren't
    shown after the FDR)
Change-Id: I97c4b2038aabf4f00cac957af6b79dcd874000ae

7 years agoMerge "MediaSessionService: Cache active sessions per an user" into oc-dev
Jaewan Kim [Mon, 17 Apr 2017 07:29:40 +0000 (07:29 +0000)]
Merge "MediaSessionService: Cache active sessions per an user" into oc-dev
am: 5fc6e63e2e

Change-Id: I8a444b4b36fe01097dc3c4e21e0df8294ada56a1

7 years agoMerge "MediaSessionService: Cache active sessions per an user" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 07:20:54 +0000 (07:20 +0000)]
Merge "MediaSessionService: Cache active sessions per an user" into oc-dev

7 years agoMerge changes I76ae853c,If94102c7 into oc-dev
Erik Kline [Mon, 17 Apr 2017 05:19:35 +0000 (05:19 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev
am: 7eb8260236

Change-Id: I29e7e076b74842098d5de36aa965a736f1a2863c

7 years agoMerge changes I76ae853c,If94102c7 into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 05:11:14 +0000 (05:11 +0000)]
Merge changes I76ae853c,If94102c7 into oc-dev

* changes:
  Ignore potential SystemProperties errors when setting net.dns
  Make ConnectivityServiceTest pass on wifi-only devices.

7 years agoAllow to finish session when all views are gone
Philip P. Moltmann [Tue, 11 Apr 2017 17:13:33 +0000 (10:13 -0700)]
Allow to finish session when all views are gone

An service can option to finish the session once all views that it
declared as important. Views that are important are all autofillable
views of any partition and the saveable fields of the last partition.

Test: CtsAutoFillServiceTestCases
Fixes: 35708237
Change-Id: I0ccade8ebb427e5d8928697ef0007c75d3f83df0

7 years agoSchedule PIP mode changes at the beginning/end of the transitions.
Winson Chung [Sun, 16 Apr 2017 22:59:43 +0000 (15:59 -0700)]
Schedule PIP mode changes at the beginning/end of the transitions.

- When transitioning from fullscreen to PiP, ensure all PiP/MW/Config
  changes come after the transition completes, and inversely, from PiP to
  fullscreen, ensure that all changes come before the transition up starts
- Add a series of tests to verify the callback state when the animation
  is canceled
- Also fixes an issue where the surface is preserved when we don't want

Bug: 37169080
Bug: 37103000
Test: bit FrameworksServicesTests:com.android.server.wm.BoundsAnimationControllerTests
Test: android.server.cts.ActivityManagerPinnedStackTests
Change-Id: I6425c95df358358ed76d9cc8a130606c2124062e

7 years agoUse vsync choreographer when moving PIP.
Winson Chung [Mon, 17 Apr 2017 01:50:43 +0000 (01:50 +0000)]
Use vsync choreographer when moving PIP.
am: 487737b876

Change-Id: Ifc6c5a57748432bf1173b27d5377ed573c70ba65

7 years agoUse vsync choreographer when moving PIP.
Winson Chung [Wed, 5 Apr 2017 21:17:08 +0000 (14:17 -0700)]
Use vsync choreographer when moving PIP.

Bug: 36371375
Test: Enter PIP, move PIP
Change-Id: I5956a3ed9e92a4cdd4bf0a55723b9f1574c1a86f

7 years agoFix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED
Dianne Hackborn [Fri, 14 Apr 2017 23:58:30 +0000 (16:58 -0700)]
Fix issue #35811414: Allow manifest receivers for ACTION_UID_REMOVED

Test: booted and ran.
Change-Id: Id972da711188177ca3ac38a22efa04c5901e7d47
Merged-In: Id972da711188177ca3ac38a22efa04c5901e7d47