OSDN Git Service
Remi NGUYEN VAN [Tue, 29 Jan 2019 10:12:13 +0000 (19:12 +0900)]
Revert "Extract network observer code from NetworkManagementService."
This reverts commit
d8bc829a85c9c9bb390e18b59ef1455b6d0b94ec.
Reason for revert: Refactoring was unnecessary
(Cherry-pick of aosp/888319 with conflicts with go/ag/
4230697)
Test: m
Change-Id: Ib4e7da3274e49f25676505a08e6ce7e7b0dfdb8d
Martijn Coenen [Tue, 29 Jan 2019 08:34:05 +0000 (08:34 +0000)]
Merge "Speed up Zygote connection retry."
Pengquan Meng [Tue, 29 Jan 2019 07:55:19 +0000 (23:55 -0800)]
[automerger skipped] Merge "new SystemAPI to getSimLocale" am:
5cf41e47fe am:
1b607c875f
am:
59691cc266 -s ours
am skip reason: change_id I8f78ba00abf0ef74bd2b2147755596edaee156cf with SHA1
108f948ffa is in history
Change-Id: I0e040ce7e13d67d8b805bc31988cf1ddb04abdfa
Remi NGUYEN VAN [Tue, 29 Jan 2019 07:47:36 +0000 (23:47 -0800)]
Merge "Add SocketUtils for NetworkStack" am:
cec60fa56a am:
27ae908282
am:
ca7c41f5fa
Change-Id: I6d059f9cd1a694659bfd7ac09a32022d29c03f85
Jaewan Kim [Tue, 29 Jan 2019 07:38:46 +0000 (07:38 +0000)]
Merge changes Ib3c350ba,I9f6b17a6
* changes:
MediaController: Make getTag() public
MediaRouter: Remove hidden annotation usages
Hyundo Moon [Tue, 29 Jan 2019 07:33:58 +0000 (07:33 +0000)]
Merge "Make hidden constructor of PlaybackInfo as @SystemApi"
Colin Cross [Tue, 29 Jan 2019 07:32:28 +0000 (23:32 -0800)]
[automerger skipped] Merge "clang-format ManifestFixer_test.cpp" am:
171c9cdc6a am:
0b7bfe4c3f
am:
5f34ef1c3d -s ours
am skip reason: change_id I10b27abb8fa8a99a41976c42c4d684b99978b4f9 with SHA1
704090e02a is in history
Change-Id: I44781846a7451d4b0353c6c7cbaa36934c87da17
Pengquan Meng [Tue, 29 Jan 2019 07:03:32 +0000 (23:03 -0800)]
Merge "new SystemAPI to getSimLocale" am:
5cf41e47fe
am:
1b607c875f
Change-Id: I2a6c1b9aaab034763f261d7464bd302ad5bbdd2d
Android Build Merger (Role) [Tue, 29 Jan 2019 07:01:49 +0000 (07:01 +0000)]
Merge "Merge "Add Secure NFC functionality" am:
3ffdb26aa8 am:
c538141c6d am:
32b84ede51"
Ruchi Kandoi [Tue, 29 Jan 2019 06:59:55 +0000 (22:59 -0800)]
Merge "Add Secure NFC functionality" am:
3ffdb26aa8 am:
c538141c6d
am:
32b84ede51
Change-Id: I67f436d48dfd5578d04d284e7669685760b0716f
Remi NGUYEN VAN [Tue, 29 Jan 2019 06:57:39 +0000 (22:57 -0800)]
Merge "Add SocketUtils for NetworkStack" am:
cec60fa56a
am:
27ae908282
Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9
Hyundo Moon [Tue, 29 Jan 2019 06:53:35 +0000 (06:53 +0000)]
Merge "Remove unused MediaSession.notifyRemoteVolumeChanged()"
Colin Cross [Tue, 29 Jan 2019 06:52:49 +0000 (22:52 -0800)]
Merge "clang-format ManifestFixer_test.cpp" am:
171c9cdc6a
am:
0b7bfe4c3f
Change-Id: I97d77c6537de1e328ba07a01cf95ade0d37933c2
Jack Yu [Tue, 29 Jan 2019 06:51:55 +0000 (22:51 -0800)]
[automerger skipped] Merge "Data profile refactoring" am:
b551d0d6d3 am:
daae1f5265
am:
697a064562 -s ours
am skip reason: change_id I04b910f8e349e8b7819ff058bf37ad06c3fd9adc with SHA1
af6b47af54 is in history
Change-Id: I8d2b53183505be5754232689e8e17696a62a8758
Amit Mahajan [Tue, 29 Jan 2019 06:41:03 +0000 (22:41 -0800)]
[automerger skipped] Merge "Add Emergency Number Test Mode" am:
783400c390 am:
4c12798e56
am:
dc458b1aa2 -s ours
am skip reason: change_id I4ea3539e3b814b71e03e956d4a857ec20141fa8c with SHA1
cb4bd3a30f is in history
Change-Id: I7b8236b9a66eb3b2815ae3065c81cd266507147d
Nick Kralevich [Tue, 29 Jan 2019 06:33:27 +0000 (22:33 -0800)]
Merge "jni: more O_CLOEXECs" am:
0bd511611e am:
c37cf98395
am:
db8af62777
Change-Id: I34f53d427efb89f295a2027ceffcb5ccbd149e0b
Jaewan Kim [Mon, 28 Jan 2019 01:24:04 +0000 (10:24 +0900)]
MediaController: Make getTag() public
This removes hidden API usages from the framework to the apex, which
would be prohibited.
Test: Build
Bug:
123485698
Change-Id: Ib3c350bad4af2e8db3788296dc78b7f7eb0693c0
Jaewan Kim [Mon, 28 Jan 2019 01:20:06 +0000 (10:20 +0900)]
MediaRouter: Remove hidden annotation usages
This removes hidden annotation usages from the framework to the apex,
which would be prohibited.
Test: Build
Bug:
123485698
Change-Id: I9f6b17a61c5438e0d538a7a97587c375d8603613
Vishnu Nair [Tue, 29 Jan 2019 06:22:46 +0000 (22:22 -0800)]
[automerger skipped] Merge "[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowStopped" into pi-dev am:
e532469994
am:
ccfc9c1480 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia13fad15b50112eef394b0a7389d16395fe7aced
Ruchi Kandoi [Tue, 29 Jan 2019 06:14:28 +0000 (22:14 -0800)]
Merge "Add Secure NFC functionality" am:
3ffdb26aa8
am:
c538141c6d
Change-Id: I5e1c1d44396099c841f09bfdd2ac956f01fd4ceb
Pavel Grafov [Tue, 29 Jan 2019 06:13:24 +0000 (22:13 -0800)]
Merge "Whitelist packages from VPN lockdown." am:
774c3ce152 am:
b478bb25ac
am:
2b996ad0dd
Change-Id: Ice1f8f27da3d0092af58c8e93969575ba9f8f925
Jack Yu [Tue, 29 Jan 2019 06:07:32 +0000 (22:07 -0800)]
Merge "Data profile refactoring" am:
b551d0d6d3
am:
daae1f5265
Change-Id: Ie04247ed0d8f6cb1139309a808ab2fb15ebcbade
Amit Mahajan [Tue, 29 Jan 2019 05:58:47 +0000 (21:58 -0800)]
Merge "Add Emergency Number Test Mode" am:
783400c390
am:
4c12798e56
Change-Id: I741e0a5899d9734bf35c50853cccb95211cb1d70
Jordan Liu [Tue, 29 Jan 2019 05:55:14 +0000 (21:55 -0800)]
Merge "CallQuality is set to empty instead of null" am:
b3f282daa1 am:
aee66949ef
am:
baa788a7aa
Change-Id: Ic6c251059d763df6f79520a5cae259f4a44601cf
TreeHugger Robot [Tue, 29 Jan 2019 05:50:27 +0000 (05:50 +0000)]
Merge "Let the compiler detect existence of fsverity.h"
Nick Kralevich [Tue, 29 Jan 2019 05:46:54 +0000 (21:46 -0800)]
Merge "jni: more O_CLOEXECs" am:
0bd511611e
am:
c37cf98395
Change-Id: I358eab4877418f2c9a09a8b8d8c4c978de0656d7
Vishnu Nair [Tue, 29 Jan 2019 05:40:57 +0000 (21:40 -0800)]
Merge "[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowStopped" into pi-dev
am:
e532469994
Change-Id: Id420ae52be01629921f2a190a0c5b10d7e074316
Amit Mahajan [Tue, 29 Jan 2019 05:37:07 +0000 (21:37 -0800)]
[automerger skipped] Merge "Add Emergency Uniform Resource Number (URN)" am:
e01a358b5b am:
888d87ac7a
am:
c322894cb2 -s ours
am skip reason: change_id I87537f7123910e9843207428eb3167a90a15b6df with SHA1
03bde886e5 is in history
Change-Id: Idf675239864ed69a1566f9212652cf8c74c3920b
Pavel Grafov [Tue, 29 Jan 2019 05:34:03 +0000 (21:34 -0800)]
Merge "Whitelist packages from VPN lockdown." am:
774c3ce152
am:
b478bb25ac
Change-Id: I10094606f74e6cdc5f4b0b6591cf776fd895b1d3
Jordan Liu [Tue, 29 Jan 2019 05:28:03 +0000 (21:28 -0800)]
Merge "CallQuality is set to empty instead of null" am:
b3f282daa1
am:
aee66949ef
Change-Id: Iee5f05e4cc0efc8c0abbe2c46c7ceedea164bbee
Nandana Dutt [Tue, 29 Jan 2019 05:25:13 +0000 (21:25 -0800)]
Merge "Remove DumpstateOptions" am:
706b2d0e16 am:
bc960e3905
am:
454d6e56f3
Change-Id: I765b9e390a709ced07f9173d05d95df5243764ab
Pengquan Meng [Tue, 29 Jan 2019 05:24:15 +0000 (21:24 -0800)]
Merge "new SystemAPI to getSimLocale"
am:
5cf41e47fe
Change-Id: I61c7c147efc223000a58ae003231f97756783076
Remi NGUYEN VAN [Tue, 29 Jan 2019 05:19:36 +0000 (21:19 -0800)]
Merge "Add SocketUtils for NetworkStack"
am:
cec60fa56a
Change-Id: I0db40afbf2de55d77d9d5493e556f499d2383f59
Colin Cross [Tue, 29 Jan 2019 05:16:13 +0000 (21:16 -0800)]
Merge "clang-format ManifestFixer_test.cpp"
am:
171c9cdc6a
Change-Id: Ia252884dd1ddb2d1aad7b9b881e1107aa8160122
Orion Hodson [Tue, 29 Jan 2019 05:15:13 +0000 (21:15 -0800)]
Merge "startop: use static_lib dependency on libdexfile." am:
ff1aa4e49a am:
db28e6e8b1
am:
0c024ea711
Change-Id: Iaf750da3c21946f10646a385258094de462a92b1
TreeHugger Robot [Tue, 29 Jan 2019 05:11:47 +0000 (05:11 +0000)]
Merge "[DO NOT MERGE] ViewRoot: Notify app when surface is released from setWindowStopped" into pi-dev
Amit Mahajan [Tue, 29 Jan 2019 05:07:57 +0000 (21:07 -0800)]
Merge "Add Emergency Uniform Resource Number (URN)" am:
e01a358b5b
am:
888d87ac7a
Change-Id: I33be4bec015d71415456a9abbd69bc705556afa8
Steven Moreland [Tue, 29 Jan 2019 05:06:54 +0000 (21:06 -0800)]
[automerger skipped] Merge "framework.jar: Include all radio HIDL libs." am:
3c7ac4e991 am:
9bb477afb6
am:
4d23111594 -s ours
am skip reason: change_id I5b40ba139d60ff330cfbc0d9d881f775616ad0dd with SHA1
e0dde65730 is in history
Change-Id: I689990ae2582644d0619ff71b161f50f1560e54a
Nandana Dutt [Tue, 29 Jan 2019 05:00:13 +0000 (21:00 -0800)]
Merge "Remove DumpstateOptions" am:
706b2d0e16
am:
bc960e3905
Change-Id: Ieb16f21c95a1fd332530e1630101b56e8c4efdb7
Nandana Dutt [Tue, 29 Jan 2019 04:58:01 +0000 (20:58 -0800)]
[automerger skipped] Merge "Expose bugreporting API as system API." am:
6ac57c669a am:
f1c0ec00a3
am:
d38769402a -s ours
am skip reason: change_id I1530f92971807b7e43c763a58dd1e18e793255da with SHA1
0a18820a49 is in history
Change-Id: Ie6a05c2659dcf2af62f65169374aa46e6c428d14
Orion Hodson [Tue, 29 Jan 2019 04:54:34 +0000 (20:54 -0800)]
Merge "startop: use static_lib dependency on libdexfile." am:
ff1aa4e49a
am:
db28e6e8b1
Change-Id: I64907bda16a8f248a27eb643b6a4621860c30928
Hyundo Moon [Tue, 29 Jan 2019 04:50:46 +0000 (13:50 +0900)]
Remove unused MediaSession.notifyRemoteVolumeChanged()
Bug:
123499849
Test: make -j;
Change-Id: Ie629b0811e07444cf277c9552aaece558e1c1f41
Steven Moreland [Tue, 29 Jan 2019 04:49:07 +0000 (20:49 -0800)]
Merge "framework.jar: Include all radio HIDL libs." am:
3c7ac4e991
am:
9bb477afb6
Change-Id: Ib163804540f5c8387c3f93ee3dcdb0e73aded2bd
Ruchi Kandoi [Tue, 29 Jan 2019 04:48:08 +0000 (20:48 -0800)]
Merge "Add Secure NFC functionality"
am:
3ffdb26aa8
Change-Id: Ic3131f8763d0e04e50a81652f6b0e08e48bd0f1e
Jack Yu [Tue, 29 Jan 2019 04:43:20 +0000 (20:43 -0800)]
Merge "Data profile refactoring"
am:
b551d0d6d3
Change-Id: Ibb6374fab2282a5db6d4f931c53ce8a1a0811988
Nandana Dutt [Tue, 29 Jan 2019 04:42:08 +0000 (20:42 -0800)]
Merge "Expose bugreporting API as system API." am:
6ac57c669a
am:
f1c0ec00a3
Change-Id: I6d0dd760b964d2e4ccfc271f001023a066c350ea
Robert Shih [Tue, 29 Jan 2019 04:39:07 +0000 (04:39 +0000)]
Merge "MediaPlayer2: pass source ID on DRM prepared event"
Amit Mahajan [Tue, 29 Jan 2019 04:36:15 +0000 (20:36 -0800)]
Merge "Add Emergency Number Test Mode"
am:
783400c390
Change-Id: I5c831c92ef0a24496f7aabc1d0a50a5ee493cb26
Nick Kralevich [Tue, 29 Jan 2019 04:31:59 +0000 (20:31 -0800)]
Merge "jni: more O_CLOEXECs"
am:
0bd511611e
Change-Id: Id9eabfa92a488dbf7a27108aff8101d602e1adc9
Pavel Grafov [Tue, 29 Jan 2019 04:18:23 +0000 (20:18 -0800)]
Merge "Whitelist packages from VPN lockdown."
am:
774c3ce152
Change-Id: I3332e495ba0c903dff3dbb9c53c5c4784ea519f4
Jordan Liu [Tue, 29 Jan 2019 04:14:51 +0000 (20:14 -0800)]
Merge "CallQuality is set to empty instead of null"
am:
b3f282daa1
Change-Id: I57b228b8d8b2c42c8a23e33d4c1c18a94c838907
Amit Mahajan [Tue, 29 Jan 2019 03:57:11 +0000 (19:57 -0800)]
Merge "Add Emergency Uniform Resource Number (URN)"
am:
e01a358b5b
Change-Id: I0c9f4182f8255ba0a6eeac501834ff26837cd357
Nandana Dutt [Tue, 29 Jan 2019 03:51:36 +0000 (19:51 -0800)]
Merge "Remove DumpstateOptions"
am:
706b2d0e16
Change-Id: I4134f2cd095e8d91a7f4444030a4c1523adb5483
Orion Hodson [Tue, 29 Jan 2019 03:48:13 +0000 (19:48 -0800)]
Merge "startop: use static_lib dependency on libdexfile."
am:
ff1aa4e49a
Change-Id: I943a8bbf6945cb156ecb202b4537dc75ba2f5cf5
Steven Moreland [Tue, 29 Jan 2019 03:44:18 +0000 (19:44 -0800)]
Merge "framework.jar: Include all radio HIDL libs."
am:
3c7ac4e991
Change-Id: Ib45dc36987acd944f0abe9496b62701557d18e2e
Nandana Dutt [Tue, 29 Jan 2019 03:40:54 +0000 (19:40 -0800)]
Merge "Expose bugreporting API as system API."
am:
6ac57c669a
Change-Id: I98b7d492e8b800670a3127224d152b8fe75e758f
TreeHugger Robot [Tue, 29 Jan 2019 03:17:37 +0000 (03:17 +0000)]
Merge "Vibrate conditionally depending on modality"
Jackal Guo [Tue, 29 Jan 2019 03:17:23 +0000 (03:17 +0000)]
Merge "Adding AppOps data for Accessibility"
Yohei Yukawa [Tue, 29 Jan 2019 03:08:03 +0000 (19:08 -0800)]
Add a unit test for EditorInfo#targetInputMethodUser
This it a follow up CL to my previous CL [1], which introduced
EditorInfo#targetInputMethodUser.
Since EditorInfo#targetInputMethodUser is an @hide API, we cannot
directly its behavior in CTS. To make sure that it can be transferred
via IPCs , this CL introduces a simple unit test for it in
FrameworksCoreTests.
[1]: Ia7ea944438d69669ccdf9111b34ba400e786a602
0f5eade4a492fc91130da1aedcad0999932f4137
Bug:
120744418
Test: atest FrameworksCoreTests:EditorInfoTest
Change-Id: I3e722b3ccbd2ff33c264d4d41aa63e704970e78d
TreeHugger Robot [Tue, 29 Jan 2019 03:05:52 +0000 (03:05 +0000)]
Merge "Ensure that framework does not refer MediaSession2 related code"
Sudheer Shanka [Tue, 29 Jan 2019 02:57:44 +0000 (02:57 +0000)]
Merge "Update DownloadStorageProvider to include MediaStore.Downloads."
TreeHugger Robot [Tue, 29 Jan 2019 02:49:24 +0000 (02:49 +0000)]
Merge "Add way to check if user has locked the bubble allowed field"
Hyundo Moon [Mon, 28 Jan 2019 11:24:37 +0000 (20:24 +0900)]
Make hidden constructor of PlaybackInfo as @SystemApi
When the android build setting is configured to a rule which moves
MediaSession1 related codes to mainline module, the non-public and
non-system APIs in the module cannot be used by the framework.
This CL makes the hidden constructor of PlaybackInfo as
system API, so that it can be used by the framework.
Bug:
123500940
Test: make update-api -j; make -j;
Change-Id: I8583d6f79c70f8bbbbedfa0a75676218aeec58e6
TreeHugger Robot [Tue, 29 Jan 2019 02:48:01 +0000 (02:48 +0000)]
Merge "Turning on job quotas by default."
TreeHugger Robot [Tue, 29 Jan 2019 02:40:25 +0000 (02:40 +0000)]
Merge "Enforce MANAGE_APP_PREDICTIONS on getShareTargets"
TreeHugger Robot [Tue, 29 Jan 2019 02:31:23 +0000 (02:31 +0000)]
Merge changes I6bda318c,Ie4d259dc
* changes:
MediaController: Remove unused constructors
Make ISessionManager.getSessions() return list of tokens
Will Brockman [Tue, 29 Jan 2019 02:08:32 +0000 (02:08 +0000)]
Merge "Add notification category information to notification logging."
TreeHugger Robot [Tue, 29 Jan 2019 02:08:13 +0000 (02:08 +0000)]
Merge "Simplify IMMS#startInputOrWindowGainedFocusInternal() part 5/5"
TreeHugger Robot [Tue, 29 Jan 2019 02:07:47 +0000 (02:07 +0000)]
Merge "Simplify IMMS#startInputOrWindowGainedFocusInternal() part 4/5"
Derek Sollenberger [Tue, 29 Jan 2019 01:58:58 +0000 (01:58 +0000)]
Merge "Add Bitmap.setColorSpace()"
TreeHugger Robot [Tue, 29 Jan 2019 01:32:15 +0000 (01:32 +0000)]
Merge "Add ACQUIRED_START message"
TreeHugger Robot [Tue, 29 Jan 2019 01:31:34 +0000 (01:31 +0000)]
Merge changes I807608d5,I4ccc56f3,I8aa75851,I09022bb2
* changes:
Simplify IMMS#startInputOrWindowGainedFocusInternal() part 3/5
Simplify IMMS#startInputOrWindowGainedFocusInternal() part 2/5
Simplify IMMS#startInputOrWindowGainedFocusInternal() part 1/5
Fix a typo in an error message in InputMethodManagerService
TreeHugger Robot [Tue, 29 Jan 2019 01:03:29 +0000 (01:03 +0000)]
Merge "Add testStartHomeOnAllDisplays back"
Jin Seok Park [Tue, 29 Jan 2019 00:49:37 +0000 (00:49 +0000)]
Merge "MetadataRetriever: Unhide Exif-related constants"
Julia Reynolds [Tue, 29 Jan 2019 00:46:32 +0000 (00:46 +0000)]
Merge "Add API for checking paused packages."
TreeHugger Robot [Tue, 29 Jan 2019 00:40:45 +0000 (00:40 +0000)]
Merge "Keep bubbles behind a flag"
TreeHugger Robot [Tue, 29 Jan 2019 00:22:23 +0000 (00:22 +0000)]
Merge "Atom: Add more Bluetooth atoms"
Pengquan Meng [Tue, 29 Jan 2019 00:21:49 +0000 (00:21 +0000)]
Merge "new SystemAPI to getSimLocale"
Hyundo Moon [Mon, 28 Jan 2019 06:43:24 +0000 (15:43 +0900)]
Ensure that framework does not refer MediaSession2 related code
Also, this CL moves mediasession2 to com.android.media apex.
Bug:
123495968
Test: Passed below tests:
atest CtsMediaTestCases:android.media.cts.MediaSession2Test;
atest CtsMediaTestCases:android.media.cts.MediaController2Test;
atest CtsMediaTestCases:android.media.cts.MediaItem2Test;
atest CtsMediaTestCases:android.media.cts.MediaSession2ServiceTest;
atest CtsMediaTestCases:android.media.cts.Session2CommandGroupTest;
atest CtsMediaTestCases:android.media.cts.Session2CommandTest;
Change-Id: I8cf7a657545e6b7b2973035f365506206e7147a0
TreeHugger Robot [Tue, 29 Jan 2019 00:10:37 +0000 (00:10 +0000)]
Merge "Atom: Add A2DP playback related atoms to StatsLog"
Kevin Chyn [Tue, 29 Jan 2019 00:08:09 +0000 (16:08 -0800)]
Vibrate conditionally depending on modality
Bug:
111548033
Test: fingerprint enroll still vibrates
Change-Id: I77f3861e0a9884de74464a1a6c488e23fbccc200
Mady Mellor [Wed, 23 Jan 2019 21:23:37 +0000 (13:23 -0800)]
Add way to check if user has locked the bubble allowed field
Also removes an extra s from a method whoooooops
Bug:
111236845
Test: atest NotificationManagerServiceTest
Change-Id: I1f77afd10b322088aa9cb39b65d70cbd84fb6dc4
Robert Shih [Fri, 25 Jan 2019 22:42:53 +0000 (14:42 -0800)]
MediaPlayer2: pass source ID on DRM prepared event
If we don't specify source ID explicitly, the default source ID 0 is
used.
Bug:
123425309
Test: MediaPlayer2DrmTest
Change-Id: I16d76d4dfbe4551f97234f27e4500cb74480f8ed
Varun Shah [Mon, 28 Jan 2019 23:53:01 +0000 (23:53 +0000)]
Merge "Removed AppUsageLimit#isGroupLimit API."
Varun Shah [Mon, 28 Jan 2019 23:52:36 +0000 (23:52 +0000)]
Merge "Removed CrossProfileApps#startAnyActivity API."
TreeHugger Robot [Mon, 28 Jan 2019 23:14:47 +0000 (23:14 +0000)]
Merge "Suppress IllegalArgumentException on API 28 or before"
Remi NGUYEN VAN [Mon, 28 Jan 2019 23:14:08 +0000 (23:14 +0000)]
Merge "Add SocketUtils for NetworkStack"
TreeHugger Robot [Mon, 28 Jan 2019 23:08:46 +0000 (23:08 +0000)]
Merge "Fix for CTS testAllowWhileIdleJobInTempwhitelist"
TreeHugger Robot [Mon, 28 Jan 2019 22:49:36 +0000 (22:49 +0000)]
Merge "Move SettingsLib icons to android."
TreeHugger Robot [Mon, 28 Jan 2019 22:45:25 +0000 (22:45 +0000)]
Merge "Allow ManagedProvisioning to access imei and serial number."
Mehdi Alizadeh [Sat, 26 Jan 2019 00:59:54 +0000 (16:59 -0800)]
Enforce MANAGE_APP_PREDICTIONS on getShareTargets
Bug:
120099033
Test: atest ShortcutManagerTest1
Change-Id: I4e105207558e00d7e802999db0b4d4d6880ca05a
Chris Tate [Mon, 28 Jan 2019 22:30:26 +0000 (22:30 +0000)]
Merge "Defer broadcasts to slow-handling apps"
Derek Sollenberger [Mon, 14 Jan 2019 18:55:08 +0000 (13:55 -0500)]
Add Bitmap.setColorSpace()
Bug:
120904891
Test: CtsGraphicsTestCases
Change-Id: I30be2cd77d810210ad87b281e6bb5587863982c3
TreeHugger Robot [Mon, 28 Jan 2019 22:21:46 +0000 (22:21 +0000)]
Merge "Camera: Add support for dynamic depth image format"
Robert Shih [Mon, 28 Jan 2019 22:21:23 +0000 (22:21 +0000)]
Merge "MediaPlayer2: create one MediaDrm per DRM scheme"
Jeff Sharkey [Mon, 28 Jan 2019 22:19:31 +0000 (22:19 +0000)]
Merge "Always copy value from DeviceConfig."
Treehugger Robot [Mon, 28 Jan 2019 22:15:35 +0000 (22:15 +0000)]
Merge "clang-format ManifestFixer_test.cpp"
TreeHugger Robot [Mon, 28 Jan 2019 22:14:57 +0000 (22:14 +0000)]
Merge "Update big clock when theme (overlay) changes."
Ruchi Kandoi [Mon, 28 Jan 2019 22:11:32 +0000 (22:11 +0000)]
Merge "Add Secure NFC functionality"
Mady Mellor [Mon, 28 Jan 2019 19:21:51 +0000 (11:21 -0800)]
Keep bubbles behind a flag
Alter tests to ignore the flags so they don't fail.
Test: manual - make sure no bubbles show up
atest BubbleControllerTest
Bug:
111236845
Change-Id: Ieed38165a3699415686ef299cd54da69d7a37cea