OSDN Git Service
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
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
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
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
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
Winson Chung [Tue, 2 May 2017 19:19:15 +0000 (19:19 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
am:
4ec5dd1d88
Change-Id: I72050ea3a1a6d2345d1f511cad2f048b4224c63c
TreeHugger Robot [Tue, 2 May 2017 19:18:33 +0000 (19:18 +0000)]
Merge "RenderScript: IWYU" into oc-dev-plus-aosp
Calin Juravle [Tue, 2 May 2017 19:16:24 +0000 (19:16 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev am:
5f016f6705
am:
711016dfbc
Change-Id: Ifde71f3cfaa3a1053f3f19f3b722620111e7e0f5
TreeHugger Robot [Tue, 2 May 2017 19:13:19 +0000 (19:13 +0000)]
Merge "Message about audio stream deprecation as warning" into oc-dev
Calin Juravle [Tue, 2 May 2017 19:10:17 +0000 (19:10 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
am:
5f016f6705
Change-Id: Ica5f01a3c66c71104ff0e3b26e9e5fdf7802bc60
Winson Chung [Tue, 2 May 2017 19:07:24 +0000 (19:07 +0000)]
Merge "Removing check preventing pinned stack tasks from matching by affinity." into oc-dev
Abodunrinwa Toki [Tue, 2 May 2017 19:07:30 +0000 (19:07 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev am:
b950ac6b0f
am:
2deb2fab29
Change-Id: I7cf2ecfb78c64f626371dedab5394d0079c8cadc
Steven Moreland [Mon, 1 May 2017 19:56:08 +0000 (12:56 -0700)]
RenderScript: IWYU
Renderscript was depending on macros from android-base that were
transitively included from MQDescriptor.h
Test: links
Bug:
37791060
Change-Id: Ie34ddef67328c5fcc6b0122a32725b980615ff43
(cherry picked from commit
dc01e938c2550390a540311b22e3e6c7603ed975)
Calin Juravle [Tue, 2 May 2017 19:03:18 +0000 (19:03 +0000)]
Merge "Make PM#notifyDexLoad oneway" into oc-dev
Makoto Onuki [Tue, 2 May 2017 19:02:23 +0000 (12:02 -0700)]
Add more information to WTF to investigate bug
37809561
Bug
37809561
Test: Build & boot -- didn't actually exercise the WTF case but it should work
since getStackTraceString accepts null too.
Change-Id: Iabfbe1fcde293fec919c65df7ea9650e1b247b9a
Abodunrinwa Toki [Tue, 2 May 2017 19:00:53 +0000 (19:00 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
am:
b950ac6b0f
Change-Id: I9ec0463e9641fb6a54e26311273932d3d1a6d41e
TreeHugger Robot [Tue, 2 May 2017 18:54:59 +0000 (18:54 +0000)]
Merge "Close file descriptor after SmartSelection is initialized." into oc-dev
Adrian Roos [Tue, 31 Jan 2017 23:10:00 +0000 (15:10 -0800)]
StatusBar: Catch OOM caused by third-party icons
Bug:
31825355
Change-Id: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
Merged-In: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extracted gradient on Overview"
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extraction shareable library"
TreeHugger Robot [Tue, 2 May 2017 18:48:14 +0000 (18:48 +0000)]
Merge "Color extraction on scrims"
Yi Kong [Tue, 2 May 2017 18:31:59 +0000 (18:31 +0000)]
Merge "SymbolComparator operator() is missing const" am:
e74483074e
am:
a522b4af78
Change-Id: If68306b217d19fb1d1d4bc71a8fd452a47aa8ed2
Yi Kong [Tue, 2 May 2017 18:26:57 +0000 (18:26 +0000)]
Merge "SymbolComparator operator() is missing const"
am:
e74483074e
Change-Id: I86f332f10f87d519c42c5880c49dacf98be2c9e5
Michael Wright [Tue, 2 May 2017 18:23:12 +0000 (19:23 +0100)]
O is API 26
Bug:
37480230
Test: build, boot
Change-Id: Idfa91e1e094606f92c4141beb8569c241c639ee1
Yi Kong [Tue, 2 May 2017 18:15:02 +0000 (18:15 +0000)]
Merge "SymbolComparator operator() is missing const"
Jean-Michel Trivi [Tue, 2 May 2017 18:02:25 +0000 (18:02 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev am:
dce4dfc6fc
am:
7f2cc46a0f
Change-Id: I7e6c6099690f514d4f4797a13989bdc61ad390f1
Dianne Hackborn [Tue, 2 May 2017 18:00:22 +0000 (18:00 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev am:
72c0ab518a
am:
c812cf27ab
Change-Id: I7a7b4b17a4eeeeda7619e6fa9702ef059af7d76f
Jean-Michel Trivi [Tue, 2 May 2017 17:56:07 +0000 (17:56 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
am:
dce4dfc6fc
Change-Id: Ic42056d370ecd0a08574dd575856ff15813bc8c0
Jean-Michel Trivi [Tue, 2 May 2017 17:52:32 +0000 (17:52 +0000)]
Merge "Audio focus: fix notifying apps to pause without an external policy" into oc-dev
Dianne Hackborn [Tue, 2 May 2017 17:51:20 +0000 (17:51 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
am:
72c0ab518a
Change-Id: I1987075221d0d5fa16483e6a41003b0394291d10
Tyler Gunn [Fri, 28 Apr 2017 17:45:23 +0000 (10:45 -0700)]
Change MANAGE_OWN_CALLS permission to be a "normal" permission.
Also remove from Phone group since this isn't really related to phone
calls as much as interacting with Telecom APIs.
Test: Manual
Bug:
37722558
Merged-In: Ia972db4bd79a34bc9b9d3896910adc205c286367
Change-Id: Icc4d2170cc7c83f653eeb0438938f7c0c91a0a7c
Dianne Hackborn [Tue, 2 May 2017 17:45:46 +0000 (17:45 +0000)]
Merge "Work on issue #
37815224: DeviceManagementService is incorrectly..." into oc-dev
Seigo Nonaka [Tue, 2 May 2017 17:44:46 +0000 (17:44 +0000)]
Merge "Fix NPE happens if no source was specified to font element." into oc-dev am:
b3e92234fa
am:
159f549c8f
Change-Id: Ief83bf6522468ab40d8dd9c3a68ab72892952ea4