OSDN Git Service
Nicolas Geoffray [Wed, 3 May 2017 08:20:12 +0000 (08:20 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev am:
e4f36952ab
am:
2c6741b660
Change-Id: I7a0f751d0ab2934435bfd0ed335308250b21f872
Nicolas Geoffray [Wed, 3 May 2017 08:10:55 +0000 (08:10 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
am:
e4f36952ab
Change-Id: I37102edeba93a4b18c943c16946b609f04c1f0eb
Nicolas Geoffray [Wed, 3 May 2017 08:04:28 +0000 (08:04 +0000)]
Merge "Update frameworks/base to new compiler filters." into oc-dev
Vladislav Kaznacheev [Wed, 3 May 2017 07:45:51 +0000 (07:45 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev am:
33f2b3b3b1
am:
f2b4b8306e
Change-Id: I8f76715c22c456b2b0aa1dcff88953487ee7399d
Vladislav Kaznacheev [Wed, 3 May 2017 07:38:47 +0000 (07:38 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
am:
33f2b3b3b1
Change-Id: I212a872da24ea6e64a90e3339cfc9e68f2eaa933
TreeHugger Robot [Wed, 3 May 2017 07:31:44 +0000 (07:31 +0000)]
Merge "Fix VideoView touch and trackball handlers to call super." into oc-dev
Sundeep Ghuman [Wed, 3 May 2017 04:37:12 +0000 (04:37 +0000)]
Merge "Updating network info state should return true." into oc-dev am:
703a233b03
am:
3b2ac89b9a
Change-Id: Ie80882f6d119a334065af7728ddda3867b21d4cf
Sundeep Ghuman [Wed, 3 May 2017 04:30:05 +0000 (04:30 +0000)]
Merge "Updating network info state should return true." into oc-dev
am:
703a233b03
Change-Id: Ib8a36b3880b65ea333a93dc4bd3ab5bca66272e7
Sundeep Ghuman [Wed, 3 May 2017 04:24:38 +0000 (04:24 +0000)]
Merge "Updating network info state should return true." into oc-dev
Ruben Brunk [Wed, 3 May 2017 04:01:11 +0000 (04:01 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev am:
24f4743f92
am:
44e317e278
Change-Id: I2a66a50580a3e7c535c0eceec6f1d8fc1cf9b32e
Ruben Brunk [Wed, 3 May 2017 03:56:01 +0000 (03:56 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
am:
24f4743f92
Change-Id: I23f5fdf5b3584861818bc378b85f98fc2e33ebb8
TreeHugger Robot [Wed, 3 May 2017 03:48:19 +0000 (03:48 +0000)]
Merge "Fix Bluetooth GATT API default handler assignment" into oc-dev
Ben Lin [Wed, 3 May 2017 02:37:27 +0000 (02:37 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev am:
d6bfaba59c
am:
bb87997182
Change-Id: I82a9b7c4542e4a2f157a608be3a991c158707f12
Ben Lin [Wed, 3 May 2017 02:30:29 +0000 (02:30 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
am:
d6bfaba59c
Change-Id: I807eaa3090e655fdc959a10fe2652c2f4d932b01
Daichi Hirono [Wed, 3 May 2017 02:27:56 +0000 (02:27 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev am:
9e37a2e419
am:
9227334834
Change-Id: I07df9ddb7136e7018b0be1d2dfaa1c7f589e0df2
Ben Lin [Wed, 3 May 2017 02:25:03 +0000 (02:25 +0000)]
Merge "Remove snippet regarding ContentProvider#notifyChange in documentation." into oc-dev
Android Build Merger (Role) [Wed, 3 May 2017 02:23:49 +0000 (02:23 +0000)]
Merge "Merge "Optionally let the instant app into disambig" into oc-dev am:
1f1d60c5a1 am:
74e39de950"
Todd Kennedy [Wed, 3 May 2017 02:23:03 +0000 (02:23 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev am:
1f1d60c5a1
am:
74e39de950
Change-Id: I4e48ba4c05d764322ad2e953430b8b02c7c09712
TreeHugger Robot [Wed, 3 May 2017 02:22:52 +0000 (02:22 +0000)]
Merge "Fade clock when pulling QS down"
TreeHugger Robot [Wed, 3 May 2017 02:22:52 +0000 (02:22 +0000)]
Merge "Quick Settings surface opacity"
Daichi Hirono [Wed, 3 May 2017 02:18:52 +0000 (02:18 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
am:
9e37a2e419
Change-Id: I7377848132c5334f0becc640ea82255ff41dee7c
Todd Kennedy [Wed, 3 May 2017 02:12:28 +0000 (02:12 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
am:
1f1d60c5a1
Change-Id: I78725fadab5bb7222f9d4528d21b22d881df45a1
TreeHugger Robot [Wed, 3 May 2017 02:12:03 +0000 (02:12 +0000)]
Merge "Don't add other's child as header or footer" into oc-dev
TreeHugger Robot [Wed, 3 May 2017 02:06:29 +0000 (02:06 +0000)]
Merge "Optionally let the instant app into disambig" into oc-dev
Dianne Hackborn [Wed, 3 May 2017 02:03:12 +0000 (02:03 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev am:
6ff7df502b
am:
6a6f5c657f
Change-Id: I51546db03c92db0b3c1751eb8e395cace528b2fe
Dianne Hackborn [Wed, 3 May 2017 01:54:08 +0000 (01:54 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
am:
6ff7df502b
Change-Id: Ic7de70297ab0eae610aeb5c359da381264779d6b
Dianne Hackborn [Wed, 3 May 2017 01:46:25 +0000 (01:46 +0000)]
Merge "More work on issue #
36891897: Need to ensure foreground..." into oc-dev
Sundeep Ghuman [Fri, 21 Apr 2017 04:25:41 +0000 (21:25 -0700)]
Updating network info state should return true.
Update AccessPoint.java so that network state changes return updated
equals true, so that corresponding UI elements will updated
appropriately.
Bug: b/
37289220
Test: runtest --path
packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I1bc74997227b46468ef11efbf183a95ec0d2b15f
Andrii Kulian [Wed, 3 May 2017 00:24:44 +0000 (00:24 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev am:
40d0f86783
am:
9f2ab1c037
Change-Id: Ide89e5b1fc51f747d8a8c420ba0b26353b9be33a
Michael Wright [Wed, 3 May 2017 00:16:45 +0000 (00:16 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev am:
adb87ec50b
am:
8efaefb5d9
Change-Id: I7a5a438aa64777a50e1f181fa5f5f0570a02170b
Andrii Kulian [Wed, 3 May 2017 00:14:14 +0000 (00:14 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
am:
40d0f86783
Change-Id: I20f2cbc97202417d57cd36aa37ebd85e4ec27bd6
Ruben Brunk [Mon, 1 May 2017 23:57:31 +0000 (16:57 -0700)]
Fix Bluetooth GATT API default handler assignment
Restores previous behaviour where GATT callbacks are invoked on the
binder thread and not the calling process main looper thread.
This fixes performance regressions as well as some
NetworkOnMainThreadException's for some applications.
Bug:
37544152
Bug:
37871717
Test: Covered by prior API tests.
Change-Id: Id8ab705dd4d7f00030e6ac29e056dde5180670e9
Michael Wright [Wed, 3 May 2017 00:08:11 +0000 (00:08 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
am:
adb87ec50b
Change-Id: I5ede652c22717b2a986b6fd7608a97e6a3531fa0
Makoto Onuki [Wed, 3 May 2017 00:06:30 +0000 (00:06 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev am:
e497b698d2
am:
bab47edecb
Change-Id: Ie781c121fbf3b71e3189cf1a84257116afd963a8
Todd Kennedy [Wed, 26 Apr 2017 19:58:28 +0000 (12:58 -0700)]
Optionally let the instant app into disambig
When a user clicks "view on web", it's not assumed this is meant to be
forever. In this case, we will adjust the instant app's verification
status so that the instant isn't automatically run.
Change-Id: I246de901dafb23159a064d205fdb614d657a99dc
Fixes:
37686922
Test: Manual
Test: 1) Install instant app
Test: 2) Set to always-ask -- adb shell pm set-app-link package.name always-ask
Test: 3) Notice that we get a disambig w/ the instant app and chrome as options
Test: 4) Set to never -- adb shell pm set-app-link package.name never
Test: 5) Notice that we don't get the instant app
Andrii Kulian [Wed, 3 May 2017 00:03:25 +0000 (00:03 +0000)]
Merge "Update ime touch exclude region for hosting display" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 23:59:46 +0000 (23:59 +0000)]
Merge changes from topic 'frankenbuild' into oc-dev
* changes:
Revert "Resource ID fixup."
Resource ID fixup.
Wale Ogunwale [Tue, 2 May 2017 23:57:47 +0000 (23:57 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev am:
5772ffcb9f
am:
9d6474140f
Change-Id: Ifc93c3af98eaf738deb9a0f1c17cceca1407489a
Makoto Onuki [Tue, 2 May 2017 23:57:45 +0000 (23:57 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
am:
e497b698d2
Change-Id: I0d5ace9d9b302e8f924d096fb245a81a3dfa8568
TreeHugger Robot [Tue, 2 May 2017 23:51:33 +0000 (23:51 +0000)]
Merge "Add more information to WTF to investigate bug
37809561" into oc-dev
Wale Ogunwale [Tue, 2 May 2017 23:51:32 +0000 (23:51 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
am:
5772ffcb9f
Change-Id: Ia344564dd1a9f6221e0737691eb4e8c8b9e27310
TreeHugger Robot [Tue, 2 May 2017 23:43:13 +0000 (23:43 +0000)]
Merge "Fixes issue where the notification menu was not visible after RTL changes"
TreeHugger Robot [Tue, 2 May 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Skip Pip animation to fullscreen if orientation is going to change" into oc-dev
Winson Chung [Tue, 2 May 2017 23:34:46 +0000 (23:34 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev am:
d6c190c8d2
am:
3d66fb6519
Change-Id: I1066d1efed081776286ef8ded7933998a89e1dd8
Winson Chung [Tue, 2 May 2017 23:27:48 +0000 (23:27 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev
am:
d6c190c8d2
Change-Id: I306a8520873eb76182f3b04617265f5bf662aaf8
Siddharth Ray [Tue, 2 May 2017 23:27:43 +0000 (23:27 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev am:
84ed81ed39
am:
e24e12df35
Change-Id: Id050d77a7df66451311713cdd54209109cda9d7a
Siddharth Ray [Tue, 2 May 2017 23:21:14 +0000 (23:21 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev
am:
84ed81ed39
Change-Id: Idfc023f7e06242f778ec8530e61aab29143e9b31
Winson Chung [Tue, 2 May 2017 23:19:24 +0000 (23:19 +0000)]
Merge "Restoring old methods for compatibility." into oc-dev
Siddharth Ray [Tue, 2 May 2017 23:13:01 +0000 (23:13 +0000)]
Merge "Added Channel for Network Initiated Notifications" into oc-dev
TreeHugger Robot [Tue, 2 May 2017 22:46:59 +0000 (22:46 +0000)]
Merge "Upstream update"
Michael Wright [Tue, 2 May 2017 22:26:41 +0000 (22:26 +0000)]
Merge "O is API 26" into oc-dev am:
074a67c116
am:
8433705f77
Change-Id: I8e394ffd699c115b316f3b6d2430ae75325d4047
Michael Dooley [Tue, 2 May 2017 22:20:45 +0000 (22:20 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev am:
4794cbf574
am:
bc06988d8b
Change-Id: Ie25fb987b0013625b697098ea518ccc4b40f8999
Winson Chung [Tue, 2 May 2017 22:14:23 +0000 (15:14 -0700)]
Restoring old methods for compatibility.
Bug:
37637423
Test: Build and test PIP apps
Change-Id: I9ccb49a3e42de55a249ab54bde2f3c5a1c179c1c
Michael Wright [Tue, 2 May 2017 22:17:25 +0000 (22:17 +0000)]
Merge "O is API 26" into oc-dev
am:
074a67c116
Change-Id: Ie1d9b8ebb3b1c1693bbce5bf7f7d1f8c7159e54e
TreeHugger Robot [Tue, 2 May 2017 22:11:53 +0000 (22:11 +0000)]
Merge "O is API 26" into oc-dev
Michael Dooley [Tue, 2 May 2017 22:08:43 +0000 (22:08 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev
am:
4794cbf574
Change-Id: I121f40cb64c546b0f6e140943d5a263ee05b05b4
Wale Ogunwale [Tue, 2 May 2017 04:32:58 +0000 (21:32 -0700)]
Skip Pip animation to fullscreen if orientation is going to change
Having this kind of animation look good is extremely difficult.
The best we can do is skip the animation and just go to fullscreen
if we know the device orientation is going to change because the
current screen configuration isn't compatible with the fixed
orientation requested by the app going fullscreen.
Change-Id: I97b14723a0d678c05efedc93fe692ad3b3212a72
Fixes:
37722472
Test: manual
Michael Dooley [Tue, 2 May 2017 22:01:12 +0000 (22:01 +0000)]
Merge "Adding voicemail transcription state to the database" into oc-dev
Adrian Roos [Tue, 2 May 2017 21:34:46 +0000 (21:34 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11 am:
7135f5d2e5 am:
6983178c59
am:
1dd8202860
Change-Id: Ia0aa31cc4c5bc0cf5d82c6ff04bea31921a8cd4d
Mady Mellor [Wed, 5 Apr 2017 01:45:30 +0000 (18:45 -0700)]
Fixes issue where the notification menu was not visible after RTL changes
- Altered how the menu location is set so that it doesn't depend on RTL
state
- Also fixes an issue where if you change from landscape to portrait or
vice versa then the menu wouldn't be visible because the placement is
based on the width of the notification which changes based on orientation
Test: (1) have notifications and show the menu, toggle the RTL state,
show the menu, note that it is visible
(2) have notifications and show the menu, rotate the device, note
that the menu is still visible
Fixes:
36874498
Change-Id: I3a3b688f2b301f5ac0446a55b668db79c323a95c
Tyler Gunn [Tue, 2 May 2017 21:25:03 +0000 (21:25 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5 am:
a2ed986390 am:
4db9f6d393 -s ours
am:
c11a96af04
Change-Id: I3cb528cbda30cf860078c8b3fe86163be684de3b
Adrian Roos [Tue, 2 May 2017 21:21:24 +0000 (21:21 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11 am:
7135f5d2e5
am:
6983178c59
Change-Id: I8c66710c1f64dc14899a019a36c046e9996058ba
Evan Rosky [Tue, 2 May 2017 21:18:23 +0000 (21:18 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev am:
3b213ed438
am:
078728f100
Change-Id: I313b35f2f20ed4e0a0af5c45ba95816a2ed7d083
Adrian Roos [Tue, 2 May 2017 21:14:20 +0000 (21:14 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons" am:
ed112e3c11
am:
7135f5d2e5
Change-Id: I2b807be9ff69796ccc3dde64fb215250d9690717
Adrian Roos [Tue, 2 May 2017 21:09:32 +0000 (21:09 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
am:
ed112e3c11
Change-Id: I60313cc9a4560fd8e8308108a4d878ab49fcbea1
Andrii Kulian [Tue, 2 May 2017 20:22:42 +0000 (13:22 -0700)]
Update ime touch exclude region for hosting display
If IME for an application is situated on a different display,
then we need to update corresponding display content's touch
exclude region.
Bug:
36515606
Test: Manual, b/
37911363
Change-Id: I43785de6f26adf88e9a76b9144b39f66f232a646
Tyler Gunn [Tue, 2 May 2017 21:07:25 +0000 (21:07 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5 am:
a2ed986390
am:
4db9f6d393 -s ours
Change-Id: Ie7051d0b4de000a304e8762916187bd2208ce029
Evan Rosky [Tue, 2 May 2017 21:01:30 +0000 (21:01 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
am:
3b213ed438
Change-Id: I5a058c7024020e41ba8747c243d7209127cba19f
Adrian Roos [Tue, 2 May 2017 21:00:40 +0000 (21:00 +0000)]
Merge "StatusBar: Catch OOM caused by third-party icons"
Tyler Gunn [Tue, 2 May 2017 20:55:45 +0000 (20:55 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." am:
34e0a257d5
am:
a2ed986390
Change-Id: I438bacc7028fb2c385a6dd21a79172f145490f6d
Evan Rosky [Tue, 2 May 2017 20:54:00 +0000 (20:54 +0000)]
Merge "Don't focus search user-specified views which are invisible" into oc-dev
Tyler Gunn [Tue, 2 May 2017 20:48:09 +0000 (20:48 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
am:
34e0a257d5
Change-Id: I4c996f0e2e3d56bb36231f765a0d1a4d15cc171c
Siddharth Ray [Mon, 1 May 2017 20:29:04 +0000 (13:29 -0700)]
Added Channel for Network Initiated Notifications
Bug=
37659896
Change-Id: I1c04a9455c320330efbcb92c352fc31b16ed8378
Wale Ogunwale [Tue, 2 May 2017 20:37:30 +0000 (20:37 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev am:
5f0e436548
am:
19ac164d1b
Change-Id: Ie7a6c7341725c6d63da0e9861d059c6bd3ad6281
Tyler Gunn [Tue, 2 May 2017 20:36:37 +0000 (20:36 +0000)]
Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission."
Michael Wright [Tue, 2 May 2017 20:35:28 +0000 (21:35 +0100)]
Revert "Resource ID fixup."
This reverts commit
e6d161554f4cb84a6a5410b2b7e9ed5348bdf96d.
Bug:
37480230
Test: build
Change-Id: I2322c34132c5c8761d7506b00b2a8cdd286a5e48
Michael Wright [Tue, 2 May 2017 19:00:10 +0000 (20:00 +0100)]
Resource ID fixup.
Remove unused resources and assign IDs to the remaining ones.
Bug:
37480230
Test: build
Change-Id: Ife792e38ae1b7b2bf6b176a52929bc3e1fa16060
Ben Lin [Tue, 2 May 2017 20:32:27 +0000 (13:32 -0700)]
Remove snippet regarding ContentProvider#notifyChange in documentation.
For ContentProvider and DocumentsProvider, throwing an exception in
their query methods will result in no Cursor returned to the remote
side. Without a cursor, there is no way to listen in on changes.
Removing the part regarding notifyChange since there's no established
paradigm on which URI to listen/notify changes on.
Test: Documentation change only.
Bug:
37876119
Change-Id: I0739794a1e8182918758ba953251ed9a3268f227
Wale Ogunwale [Tue, 2 May 2017 20:29:00 +0000 (20:29 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
am:
5f0e436548
Change-Id: Icc1d09c16abc31d15a7ea5960ab1640ae265c31c
Abodunrinwa Toki [Tue, 2 May 2017 20:24:08 +0000 (20:24 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev am:
3cb61255ab
am:
0ed16d0d42
Change-Id: I8ccf6ff7f16cc94e9213442383e8eb9c58b5d18d
Wale Ogunwale [Tue, 2 May 2017 20:23:43 +0000 (20:23 +0000)]
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
Android Build Merger (Role) [Tue, 2 May 2017 20:21:51 +0000 (20:21 +0000)]
Merge "Merge "Fix cancel when the same notification is enqueued twice." into oc-dev am:
67ced6c08f am:
ef8ba7dc61"
Geoffrey Pitsch [Tue, 2 May 2017 20:20:58 +0000 (20:20 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev am:
67ced6c08f
am:
ef8ba7dc61
Change-Id: I5fa7da9a5779220deeaf00e00a5cbf3eca0a5ca5
Abodunrinwa Toki [Tue, 2 May 2017 20:17:18 +0000 (20:17 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
am:
3cb61255ab
Change-Id: Ie089ed63df8064798fa98a8a2378b81d09cf3b1c
Wale Ogunwale [Tue, 2 May 2017 20:16:39 +0000 (13:16 -0700)]
Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays
Reduce pre-submit noise. We can re-enable once we figure-out why it
is flaky.
Bug:
37908381
Test: disabled!
Change-Id: Ia82ba73fafafc433487027f2ee2d582dceb65ed2
Sudheer Shanka [Tue, 2 May 2017 20:14:38 +0000 (20:14 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev am:
89bc8b17d6
am:
1c4a1c8bdb
Change-Id: Id8b15764fb613a78bc497b349f7b716e4a1b3b88
Geoffrey Pitsch [Tue, 2 May 2017 20:11:50 +0000 (20:11 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
am:
67ced6c08f
Change-Id: Iadde1ec051096176e68fbec5f0a3ce2acf3eb39b
TreeHugger Robot [Tue, 2 May 2017 20:05:42 +0000 (20:05 +0000)]
Merge "Support resetting "smart selection" to any word in the selection." into oc-dev
Sudheer Shanka [Tue, 2 May 2017 20:04:57 +0000 (20:04 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
am:
89bc8b17d6
Change-Id: Id87f06d4e13059e2f258508bf31348aba85ca5a9
TreeHugger Robot [Tue, 2 May 2017 20:02:13 +0000 (20:02 +0000)]
Merge "Fix cancel when the same notification is enqueued twice." into oc-dev
Yi Kong [Tue, 2 May 2017 20:00:21 +0000 (20:00 +0000)]
Merge "Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
am:
51ccc24d57
Change-Id: Ib6109c22c278ce00ad1a0c6d3d1e6a7903cfad2f
Sudheer Shanka [Tue, 2 May 2017 19:56:59 +0000 (19:56 +0000)]
Merge "Add commandline option to update power-save-except-idle whitelist." into oc-dev
Calin Juravle [Tue, 2 May 2017 19:55:16 +0000 (19:55 +0000)]
Merge "Make PM#registerDexModule oneway"
TreeHugger Robot [Tue, 2 May 2017 19:54:21 +0000 (19:54 +0000)]
Merge "Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp" into oc-dev-plus-aosp
Yi Kong [Tue, 2 May 2017 19:49:25 +0000 (12:49 -0700)]
Resolve merge conflicts of
ccc5b9bbd02a to oc-dev-plus-aosp
Test: Build
Change-Id: I7d3d6bb4c436b2025a0293f9c6475855243f4dd9
Jean-Michel Trivi [Tue, 2 May 2017 19:42:15 +0000 (19:42 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev am:
dd8a71f4a9
am:
86af1cd18f
Change-Id: I8c3627d5756661115c66228187c2b0685a7145f3
Winson Chung [Tue, 2 May 2017 19:31:01 +0000 (19:31 +0000)]
Merge "Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev am:
4ec5dd1d88" into oc-dev-plus-aosp
am:
ad2827eef4
Change-Id: Idb25a7c850d39232d32acbd98b68f37a70a5f621
Steven Moreland [Tue, 2 May 2017 19:26:20 +0000 (19:26 +0000)]
Merge "RenderScript: IWYU" into oc-dev-plus-aosp
am:
6ab4c986f2
Change-Id: Ib6cb3067743b3ef5fd341bd8f9826793c6a8a0e7
Jean-Michel Trivi [Tue, 2 May 2017 19:24:43 +0000 (19:24 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
am:
dd8a71f4a9
Change-Id: I35b530efc40eb025b5e1b0fe757ed2e4ed6a33ac
Android Build Merger (Role) [Tue, 2 May 2017 19:20:28 +0000 (19:20 +0000)]
Merge "Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev am:
4ec5dd1d88" into oc-dev-plus-aosp
OSDN Git Service
