OSDN Git Service
Julia Reynolds [Mon, 17 Apr 2017 22:27:58 +0000 (22:27 +0000)]
Merge "Add user to channel/group modification callbacks." into oc-dev am:
1ed2771450
am:
c04cb25cdb
Change-Id: Ic73c2271e9a764a032392c71a6cf46839e2c06e0
Winson Chung [Mon, 17 Apr 2017 22:26:52 +0000 (22:26 +0000)]
Merge "Schedule PIP mode changes at the beginning/end of the transitions." into oc-dev am:
11139e913c
am:
7e60dac6cb
Change-Id: I599f62dbb9c17e3cdb79ea2363d6e162260793da
Todd Lee [Mon, 17 Apr 2017 22:25:20 +0000 (22:25 +0000)]
Merge "OEM single-build/multi-SKU via dynamic RRO support" into oc-dev am:
c025ea892e
am:
4dbe8216ac
Change-Id: I32dd4c3c11116acb164578b8de2ad66f36c46430
Makoto Onuki [Mon, 17 Apr 2017 22:19:05 +0000 (22:19 +0000)]
Merge "Enhance PinItemRequest javadoc" into oc-dev am:
5838563e93
am:
deda224f14
Change-Id: Ib62d8fc270656df7e74a534645478fc78214ee6b
Philip P. Moltmann [Mon, 17 Apr 2017 22:10:49 +0000 (22:10 +0000)]
Merge "Allow to finish session when all views are gone" into oc-dev am:
3440e92009
am:
88a9bd73bb
Change-Id: I90aa430b7bcb5494804abc3960273c32b1c1bf81
Adrian Roos [Mon, 17 Apr 2017 22:04:52 +0000 (22:04 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev am:
1c4c981c03
am:
1eb27d06c5
Change-Id: I75bac43421227497d68e5e28790c256f86624421
Jordan Liu [Mon, 17 Apr 2017 21:59:10 +0000 (21:59 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev am:
728fbfb7c1
am:
f63d979045 -s ours
Change-Id: Iffb58ee0b43552e8c60396872174377c2d1ed4f0
Makoto Onuki [Mon, 17 Apr 2017 21:55:53 +0000 (21:55 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" into oc-dev am:
c3fa6ab2ac
am:
9381a4542d
Change-Id: I0d8ffd125fdec072e4345cd109a1d71969cea952
Aurimas Liutikas [Mon, 17 Apr 2017 21:54:36 +0000 (21:54 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." into oc-dev am:
ff4e132cff
am:
a49fb70e5f
Change-Id: Idf8a195e9abfa74289f6c6978382fad62f93d87b
Chien-Yu Chen [Mon, 17 Apr 2017 21:50:01 +0000 (21:50 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev am:
3b41407f19
am:
e92d62ac89
Change-Id: Ia748c7848e6feedd87294475093837b43c3cc55e
Joe LaPenna [Mon, 17 Apr 2017 21:48:18 +0000 (21:48 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." into oc-dev am:
5b06dbd12b
am:
feb382e926
Change-Id: I96de8a97ca2825ffa02cfce474025bc43b3c3331
Brian Duddie [Mon, 17 Apr 2017 21:46:51 +0000 (21:46 +0000)]
Merge "ContextHubService: Pass on query requests" into oc-dev am:
befd33975c
am:
2f23a1a7a1
Change-Id: I3392ad2be1113bf69381e0c7f108bb9ca1a59492
Selim Cinek [Mon, 17 Apr 2017 21:45:43 +0000 (21:45 +0000)]
Merge changes I22b55b73,Id050f2f5 into oc-dev am:
d8d7a283bd
am:
324b399798
Change-Id: I1b8d5eb716a80f26370e3e46d587a9a4922c343e
Adrian Roos [Mon, 17 Apr 2017 21:44:31 +0000 (21:44 +0000)]
Merge "AOD: Fix icon color when updating on AOD" into oc-dev am:
f0111ce8b6
am:
7b9bff257b
Change-Id: Ib2fdd178c0de90221a460cd1839de56ff02ed1dc
Dianne Hackborn [Mon, 17 Apr 2017 21:43:16 +0000 (21:43 +0000)]
Merge "Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED" into oc-dev am:
e15f91276c" into oc-dev-plus-aosp
am:
7c024fd5eb -s ours
Change-Id: I71e3341621ef9b07dce887d8cea99bd55b16f9b9
Jordan Liu [Mon, 17 Apr 2017 21:41:01 +0000 (21:41 +0000)]
Merge "Update api for ServiceStateProvider" am:
286b5f117d am:
ea4a67ddd1 am:
56a13d1bce
am:
e08f67f2ad -s ours
Change-Id: Ia45e9c4a001f1de182e60970791919c1014431a2
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
Fan Zhang [Mon, 17 Apr 2017 21:37:16 +0000 (21:37 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev am:
46f6e69e1b
am:
215cc7914e
Change-Id: I1dc55a1529803cd2b4c930c79fd110051b5b3a8c
TreeHugger Robot [Mon, 17 Apr 2017 21:35:17 +0000 (21:35 +0000)]
Merge "resolve merge conflicts of
2439e19d4127 to master"
TreeHugger Robot [Mon, 17 Apr 2017 21:26:49 +0000 (21:26 +0000)]
Merge "Add user to channel/group modification callbacks." 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
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
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
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
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
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
Qingxi Li [Mon, 17 Apr 2017 20:59:06 +0000 (20:59 +0000)]
Merge "Add disable carrier button for eSIM"
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
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
Makoto Onuki [Mon, 17 Apr 2017 20:50:38 +0000 (20:50 +0000)]
Merge "Enhance PinItemRequest javadoc" 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
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
TreeHugger Robot [Mon, 17 Apr 2017 20:41:02 +0000 (20:41 +0000)]
Merge "AOD: disable quicksettings while dozing" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 20:37:25 +0000 (20:37 +0000)]
Merge "Update api for ServiceStateProvider" into oc-dev
TreeHugger Robot [Mon, 17 Apr 2017 20:35:55 +0000 (20:35 +0000)]
Merge "getApplicationInfo() should throw NameNotFoundException" 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
TreeHugger Robot [Mon, 17 Apr 2017 20:15:16 +0000 (20:15 +0000)]
Merge "Enhance Chronometer to better support Swedish countdowns." 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
TreeHugger Robot [Mon, 17 Apr 2017 19:49:07 +0000 (19:49 +0000)]
Merge "Camera: Override enableZsl based on SDK version" into oc-dev
Romain Guy [Mon, 17 Apr 2017 19:31:09 +0000 (12:31 -0700)]
resolve merge conflicts of
2439e19d4127 to master
Test: built locally
Change-Id: Idc922c7fa3306e6884b88c79e73f5375d8e65888
TreeHugger Robot [Mon, 17 Apr 2017 19:22:43 +0000 (19:22 +0000)]
Merge "EUICC API changes to support error resolution."
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
TreeHugger Robot [Mon, 17 Apr 2017 19:02:58 +0000 (19:02 +0000)]
Merge "Make NETWORK_RECOMMENDATIONS_ENABLED hidden." 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
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
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
TreeHugger Robot [Mon, 17 Apr 2017 18:51:43 +0000 (18:51 +0000)]
Merge "ContextHubService: Pass on query requests" 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
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
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
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
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
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
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
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
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
TreeHugger Robot [Mon, 17 Apr 2017 18:25:48 +0000 (18:25 +0000)]
Merge "Remove FrameLayout around toolbar" into oc-dev
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
TreeHugger Robot [Mon, 17 Apr 2017 18:20:10 +0000 (18:20 +0000)]
Merge "Properly decode colors spaces in BitmapRegionDecoder" into oc-dev
Jordan Liu [Mon, 17 Apr 2017 18:14:23 +0000 (18:14 +0000)]
Merge "Update api for ServiceStateProvider"
am:
286b5f117d
Change-Id: I8404dad9be43a0ea41a973d289014a4fe1529ab3
Jaewan Kim [Mon, 17 Apr 2017 18:11:06 +0000 (18:11 +0000)]
Merge "TV PIP: Remove onboarding activity and overlay activity" into oc-dev am:
bde4eb5bcb
am:
6b2d5be466
Change-Id: I3d542488d089b926662644d124098ca229fa5450
Tyler Gunn [Mon, 17 Apr 2017 18:09:20 +0000 (18:09 +0000)]
Merge "DO NOT MERGE Expose phone account register/unregister intents." into oc-dev am:
790ec07c26
am:
e935b6e544 -s ours
Change-Id: Icd8f538d2cd20ead660376ca7bd7f2fbf6348aea
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
Treehugger Robot [Mon, 17 Apr 2017 18:05:02 +0000 (18:05 +0000)]
Merge "Update api for ServiceStateProvider"
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
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
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
Chris Tate [Mon, 17 Apr 2017 17:52:21 +0000 (17:52 +0000)]
Merge "Don't back up disabled apps" into oc-dev am:
628690ea2b
am:
281def0704
Change-Id: Ibbb8403bdf68d6a55b67ee361b578e2aa767bb42
Rebecca Silberstein [Mon, 17 Apr 2017 17:50:44 +0000 (17:50 +0000)]
Merge "Merge "WifiManager: add new methods to start softap" am:
be2653d41e am:
334fe54661 am:
2dda9f5d66" into oc-dev-plus-aosp
am:
a7cba48907
Change-Id: Id27920b3012adde075cfc270b14b5378037913c0
Yoshinori Hirano [Mon, 17 Apr 2017 17:49:23 +0000 (17:49 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev am:
1afa1646a2
am:
8a323ab65f
Change-Id: I7003321f7d5a66ec73d0e7f7765be3135a06536e
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
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
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
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
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
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)
Chris Tate [Mon, 17 Apr 2017 17:35:46 +0000 (17:35 +0000)]
Merge "Don't back up disabled apps" into oc-dev
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
TreeHugger Robot [Mon, 17 Apr 2017 17:28:33 +0000 (17:28 +0000)]
Merge "Fix EmergencyCryptKeeperText initialization" into oc-dev
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
Hangyu Kuang [Mon, 17 Apr 2017 17:20:20 +0000 (17:20 +0000)]
Merge "media: Address API review comments" into oc-dev am:
ab312729ce
am:
bde6da6f18
Change-Id: Ic22500200177a43874dbbd5a4fb327a8c9a7d25f
Andrii Kulian [Mon, 17 Apr 2017 17:17:19 +0000 (17:17 +0000)]
Merge "Temporary remove resource-display caching" into oc-dev am:
8f4bd67929
am:
8063101678
Change-Id: I1ca01d912880b629b67a25a2a03e257f35a83400
Bryce Lee [Mon, 17 Apr 2017 17:16:09 +0000 (17:16 +0000)]
Merge "Don't allow stacks above pinned stack." into oc-dev am:
22d4ef008d
am:
e7ac364ae1
Change-Id: I2c8daf0f23090fedf2ed0b24f743a50efd4d3a54
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
TreeHugger Robot [Mon, 17 Apr 2017 17:11:27 +0000 (17:11 +0000)]
Merge "use sk_sp to manage colortables"
Rebecca Silberstein [Mon, 17 Apr 2017 17:10:37 +0000 (17:10 +0000)]
Merge "WifiManager: add new methods to start softap"
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
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
Hangyu Kuang [Mon, 17 Apr 2017 17:04:17 +0000 (17:04 +0000)]
Merge "media: Address API review comments" into oc-dev
Dianne Hackborn [Mon, 17 Apr 2017 17:02:54 +0000 (17:02 +0000)]
Merge "Fix issue #
35811414: Allow manifest receivers for ACTION_UID_REMOVED"
Andrii Kulian [Mon, 17 Apr 2017 16:59:56 +0000 (16:59 +0000)]
Merge "Temporary remove resource-display caching" 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
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
Android Build Merger (Role) [Mon, 17 Apr 2017 16:53:27 +0000 (16:53 +0000)]
Merge "Merge "Synchronously update APs in during forceUpdate." into oc-dev am:
6bdbc4abec am:
17bc64597c"
Jordan Liu [Mon, 17 Apr 2017 16:53:09 +0000 (16:53 +0000)]
Merge "Update api for ServiceStateProvider"
Sundeep Ghuman [Mon, 17 Apr 2017 16:52:31 +0000 (16:52 +0000)]
Merge "Synchronously update APs in during forceUpdate." into oc-dev am:
6bdbc4abec
am:
17bc64597c
Change-Id: I02b3ff391b10ed1f2ced5b7149c77b68b90fa63e
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
Julia Reynolds [Mon, 17 Apr 2017 16:42:07 +0000 (16:42 +0000)]
Merge "Also use the notification's sound for the misc channel" into oc-dev am:
ed8f49efdc
am:
f6ca4cfcd2
Change-Id: I195ac4a4006cfc746b784f4f99d6fe42c93e40af
TreeHugger Robot [Mon, 17 Apr 2017 16:34:49 +0000 (16:34 +0000)]
Merge "Synchronously update APs in during forceUpdate." 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
OSDN Git Service
