OSDN Git Service
Kevin Chyn [Fri, 22 Mar 2019 22:52:08 +0000 (15:52 -0700)]
Do not remove enumerate client immediately when user switches
The client should not be removed until ERROR_CANCEL is removed in the
system service, since that's the HIDL contract. Pending clients will start
after, automatically with the current logic.
Test: With fingerprint enrolled on multiple users, switch rapidly
system service does not crash
Fixes:
128346522
Change-Id: I6907d8f76373c012ddffd2b98a81d70e79ac72ab
TreeHugger Robot [Fri, 22 Mar 2019 16:30:08 +0000 (16:30 +0000)]
Merge "Allow home app being instrumented while starting home from PhoneWindowManager"
Kai Shi [Fri, 22 Mar 2019 16:21:35 +0000 (16:21 +0000)]
Merge "Wifi Usability: address comments from API review council"
Michael Wright [Fri, 22 Mar 2019 16:21:15 +0000 (16:21 +0000)]
Merge "Move TEXT_HANDLE_MOVE and CLOCK_TICK to TEXTURE_TICK."
Irina Dumitrescu [Fri, 22 Mar 2019 16:12:39 +0000 (16:12 +0000)]
Merge "Change existing LockPatternUtil APIs to fail untrusted password updates."
Valerie Hau [Fri, 22 Mar 2019 16:11:20 +0000 (16:11 +0000)]
Merge "Adding AHardwareBuffer lockAndGetInfo to libandroid"
Lucas Dupin [Fri, 22 Mar 2019 16:11:05 +0000 (16:11 +0000)]
Merge "Ignore prox data when it's obsolete"
TreeHugger Robot [Fri, 22 Mar 2019 16:09:30 +0000 (16:09 +0000)]
Merge "Call ClockPlugin#onTimeTick on lock screen"
Irina Dumitrescu [Thu, 28 Feb 2019 17:34:19 +0000 (17:34 +0000)]
Change existing LockPatternUtil APIs to fail untrusted password updates.
Add alternative APIs to allow untrusted password changes explicitly, so the caller
can choose to use them if needed.
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/locksettings/
Bug:
120039091
Change-Id: I4ca03c9185081d300d7e325965b1e20515e33d51
Eric Laurent [Fri, 22 Mar 2019 15:57:49 +0000 (15:57 +0000)]
Merge "API changes in MicrophoneDirection"
Sunny Goyal [Fri, 22 Mar 2019 15:55:17 +0000 (15:55 +0000)]
Merge "Updating the AppTarget API to use a builder for constuction"
TreeHugger Robot [Fri, 22 Mar 2019 15:53:32 +0000 (15:53 +0000)]
Merge "API council feedback for dnd"
TreeHugger Robot [Fri, 22 Mar 2019 15:36:23 +0000 (15:36 +0000)]
Merge "Skip the target activity when settings state to disallow sysui flags"
Jeff Sharkey [Fri, 22 Mar 2019 15:28:17 +0000 (15:28 +0000)]
Merge "Respond to API feedback on DIRECTORY columns."
TreeHugger Robot [Fri, 22 Mar 2019 15:24:29 +0000 (15:24 +0000)]
Merge "Updating onLocation related APIs to onLaunchLocation as per API review"
Kai Shi [Wed, 20 Mar 2019 20:55:47 +0000 (13:55 -0700)]
Wifi Usability: address comments from API review council
Rename getIsSameRegisteredCell() to isSameRegisteredCell().
Bug:
128919394
Test: wifi unit test with frameworks/base/wifi/tests/runtests.sh
Change-Id: I3549d9abbaba87971ea3c0a9edf4351289731912
Josh Tsuji [Fri, 22 Mar 2019 15:19:00 +0000 (15:19 +0000)]
Merge "Adds PhysicsPropertyAnimator, which simplifies animation controllers."
Hyunyoung Song [Fri, 22 Mar 2019 15:07:19 +0000 (15:07 +0000)]
Merge "OverlayManager API fixes"
Jeff Sharkey [Fri, 22 Mar 2019 15:04:55 +0000 (15:04 +0000)]
Merge "More apps making assumptions about MediaStore."
Jeff Sharkey [Fri, 22 Mar 2019 15:04:50 +0000 (15:04 +0000)]
Merge "Documentation based on API council feedback."
Michael Wright [Thu, 21 Mar 2019 21:26:05 +0000 (21:26 +0000)]
Move TEXT_HANDLE_MOVE and CLOCK_TICK to TEXTURE_TICK.
TEXTURE_TICK is a new constant that is expected to be called repeatedly
in order to simulate a texture effect when a user is interacting with
the device, like with TEXT_HANDLE_MOVE.
Bug:
111461797
Test: Manual
Change-Id: Ia21de3ce1755a908b4bd4fcbdda411864e5b9fe9
Richard Uhler [Fri, 22 Mar 2019 14:26:01 +0000 (14:26 +0000)]
Merge "Remove TEST_MANAGE_ROLLBACKS permission from @SystemApi"
TreeHugger Robot [Fri, 22 Mar 2019 14:07:28 +0000 (14:07 +0000)]
Merge "MediaProjection: Temporarily disable f/g service requirement."
TreeHugger Robot [Fri, 22 Mar 2019 13:58:23 +0000 (13:58 +0000)]
Merge changes from topic "non-zygote"
* changes:
Compact system processes.
Compact persistent and BFGS processes.
Fabian Kozynski [Fri, 22 Mar 2019 13:52:21 +0000 (13:52 +0000)]
Merge "Visual changes to QS."
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:44:40 +0000 (06:44 -0700)]
[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am:
88e2a9aaee am:
02f43694e4
am:
84256d8d0f -s ours
am skip reason: change_id I9c2f8347952f3cc65759472b0e1a2717b285e44e with SHA1
e30e3928f9 is in history
Change-Id: Ibaf1e8320f8603c5eb6d33a4a4c862e9dbc2559f
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:35:02 +0000 (06:35 -0700)]
Merge "Add @UnsupportedAppUsage annotations" am:
88e2a9aaee
am:
02f43694e4
Change-Id: Id5e95d173ab7c2595ae148f73d3d7381b0ea8226
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:25:44 +0000 (06:25 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am:
88e2a9aaee
Change-Id: I63ae22279aa46522b652cdc9329567a04a7ef136
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:12:41 +0000 (13:12 +0000)]
Merge "Add @UnsupportedAppUsage annotations"
TreeHugger Robot [Fri, 22 Mar 2019 12:31:22 +0000 (12:31 +0000)]
Merge "Sharesheet - Support landscape mode"
Dongwon Kang [Fri, 22 Mar 2019 12:30:00 +0000 (12:30 +0000)]
Merge "MediaPlayer2: use TrackInfo based track APIs"
Dongwon Kang [Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)]
Merge "Use ProxyFileDescriptorCallback instead of DataSourceCallback"
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:55:01 +0000 (04:55 -0700)]
[automerger skipped] Merge "Add telephony sources to hiddenapi-mappings" am:
824c531396 am:
f3cf84c690
am:
f8a2dbface -s ours
am skip reason: change_id I1f7d2722bd7621c9f6d1195ea212a7a0454d560d with SHA1
6dd843a6b2 is in history
Change-Id: Ia9bbf24ebd22c4b2b8cae18d5723be98e6c7ceb9
TreeHugger Robot [Fri, 22 Mar 2019 11:51:48 +0000 (11:51 +0000)]
Merge "Add Looper.prepare() to doInBackground()"
Lorenzo Colitti [Fri, 22 Mar 2019 11:46:21 +0000 (11:46 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:46:02 +0000 (04:46 -0700)]
Merge "Add telephony sources to hiddenapi-mappings" am:
824c531396
am:
f3cf84c690
Change-Id: I469462b12f0813e6ed7bd179ff58d4c09fbd50a5
Andrei Onea [Fri, 22 Mar 2019 11:32:59 +0000 (11:32 +0000)]
Add @UnsupportedAppUsage annotations
For packages:
android.companion
android.filterfw
android.hardware.camera2.utils
android.inputmethodservice
android.net.nsd
android.os
android.preference
android.security.keymaster
android.service.dreams
android.telecom
android.telephony.ims.compat.feature
android.telephony
android.util
android.view.accessibility
android.media.effect
This is an automatically generated CL. See go/UnsupportedAppUsage
for more details.
Exempted-From-Owner-Approval: Mechanical changes to the codebase
which have been approved by Android API council and announced on
android-eng@
Bug:
110868826
Test: m
Merged-In: I9c2f8347952f3cc65759472b0e1a2717b285e44e
Change-Id: I14793863cf815fa3383fec6c6bf5a9365c2e17eb
Abhijeet Kaur [Thu, 21 Mar 2019 15:42:43 +0000 (15:42 +0000)]
Add Looper.prepare() to doInBackground()
Fix runtime error that was being thrown as Looper.prepare() was not called
in the async function doInBackground.
Bug:
124612105
Test: Was not able to reproduce the bug (that is make code execution flow
through the catch block).
* Reproduced by throwing IOException in the try block so that code flows
to the catch block.
* Build and flash.
* Take interactive bugreport and change title and name of the bugreport from
the progress bar.
Change-Id: I6a5ea594d95462e1c66bd28eb81dd5f4daa6f35e
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:36:49 +0000 (04:36 -0700)]
Merge "Add telephony sources to hiddenapi-mappings"
am:
824c531396
Change-Id: Ic5a0a2600dcdd030139f0c50e3b445053ba2c2c5
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:24:50 +0000 (11:24 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"
Jack Yu [Fri, 22 Mar 2019 11:18:26 +0000 (04:18 -0700)]
[automerger skipped] Merge "Renamed the variable" am:
afa94f4664 am:
f2a8ea192c
am:
da5ed35119 -s ours
am skip reason: change_id I4deb1271818019465c55b59cd4a4a8029b514697 with SHA1
1746d2582a is in history
Change-Id: I9906f4cd11e47e45e6b3043b8c7510173f3e7a6d
Rubin Xu [Fri, 22 Mar 2019 11:12:21 +0000 (11:12 +0000)]
Merge "Improve javadoc"
Remi NGUYEN VAN [Fri, 22 Mar 2019 11:12:02 +0000 (04:12 -0700)]
Merge "Fix targetSdkVersion for NetworkStack" am:
42b97de9d3 am:
ba2f3d2fdf
am:
1e7e29593b
Change-Id: Ic2d8c541ab6ba827d13f7d6a00a6f3b279489646
Hall Liu [Fri, 22 Mar 2019 11:01:46 +0000 (04:01 -0700)]
[automerger skipped] Merge "Add NETWORK_SCAN permission" am:
419956210a am:
3f7de4bc99
am:
92600e3fda -s ours
am skip reason: change_id I2dd4beffca3afdcc0a0f071404ff62747faa3877 with SHA1
e4f2c0f957 is in history
Change-Id: I512c278506ddc440cef01fbe145c8413687126ae
Lucas Lin [Fri, 22 Mar 2019 10:50:47 +0000 (03:50 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog" am:
507d69d5d9 am:
e2f6ad6b48
am:
dd59bce71f
Change-Id: I2ba8244fe582c4194f9d2a60d9562b12d5c8e431
Android Build Merger (Role) [Fri, 22 Mar 2019 10:36:51 +0000 (10:36 +0000)]
Merge "Merge "Support query cancellation for async DNS API" am:
aed6ea52de am:
c19f41b2b2 am:
50c86d592a"
Luke Huang [Fri, 22 Mar 2019 10:35:57 +0000 (03:35 -0700)]
Merge "Support query cancellation for async DNS API" am:
aed6ea52de am:
c19f41b2b2
am:
50c86d592a
Change-Id: I034361541f64c10d72474beaefdb3547c9c2733e
Narayan Kamath [Fri, 22 Mar 2019 10:29:59 +0000 (10:29 +0000)]
Merge "SystemUI: Update styling of media projection permission dialog."
Lucas Lin [Fri, 22 Mar 2019 10:27:52 +0000 (03:27 -0700)]
[automerger skipped] Merge "Modify SettingsLib for partial connectivity" am:
64bb980f45 am:
1eb23ba267
am:
04bd7a8bad -s ours
am skip reason: change_id I4791abe9351c62d9549ada383aa4cc8aa34ddaf2 with SHA1
fc731abf72 is in history
Change-Id: I2829c7d9c54f2e3ce0e067a39d446fb7b73667ca
Android Build Merger (Role) [Fri, 22 Mar 2019 10:10:05 +0000 (10:10 +0000)]
Merge "[automerger skipped] Merge changes from topic "iwlan_api_review" am:
ac3406f9c6 am:
8a6dbb8446 am:
228d75b448 -s ours am skip reason: change_id I0f93c07207b10b566e9f858361e55b18dc0881a0 with SHA1
806b64228d is in history"
Jack Yu [Fri, 22 Mar 2019 10:08:48 +0000 (03:08 -0700)]
[automerger skipped] Merge changes from topic "iwlan_api_review" am:
ac3406f9c6 am:
8a6dbb8446
am:
228d75b448 -s ours
am skip reason: change_id I0f93c07207b10b566e9f858361e55b18dc0881a0 with SHA1
806b64228d is in history
Change-Id: Ia19c98537474060a68a0eae6f26dcb9f0c385124
TreeHugger Robot [Fri, 22 Mar 2019 10:03:29 +0000 (10:03 +0000)]
Merge "Fix activities cannot be resumed when non-secure keyguard shown"
Brad Ebinger [Fri, 22 Mar 2019 10:02:46 +0000 (03:02 -0700)]
Merge "Fix build due to no explanatory comment." am:
0b6c77167e am:
7d73c0b4d6
am:
e6a02a8067
Change-Id: Ib3e217045a6d46dc7185b518449d4a905ac78c8d
TreeHugger Robot [Fri, 22 Mar 2019 09:46:14 +0000 (09:46 +0000)]
Merge "resolve merge conflicts of
0569184dc0336873ecae5d7ae6210393f9e27282 to master"
Hai Zhang [Fri, 22 Mar 2019 09:43:48 +0000 (09:43 +0000)]
Merge "Add getDeclaredShareLibraries() for role qualification checking."
Chiachang Wang [Fri, 22 Mar 2019 09:43:40 +0000 (09:43 +0000)]
Merge "Add network stack proto"
TreeHugger Robot [Fri, 22 Mar 2019 09:42:22 +0000 (09:42 +0000)]
Merge "Bubble permission prompt - set theme font"
Jack Yu [Fri, 22 Mar 2019 09:41:17 +0000 (02:41 -0700)]
Merge "Renamed the variable" am:
afa94f4664
am:
f2a8ea192c
Change-Id: I915e00c7392e31180099abf35982cc1a5a3ffc17
Jack Yu [Fri, 22 Mar 2019 09:32:18 +0000 (02:32 -0700)]
Merge "Renamed the variable"
am:
afa94f4664
Change-Id: I688d8126bb0207f8efcccba3e9857144e3f6067b
Chilun [Fri, 22 Mar 2019 06:41:30 +0000 (14:41 +0800)]
Allow home app being instrumented while starting home from PhoneWindowManager
The Launcher tests about home key will go througth PhoneWindowManager
and call to RootActivityContainer#startHomeOnDisplay().
The original startHomeOnDisplay() calls canStartHomeOnDisplay() with
allowInstrumenting=false and causes the tests fail.
This patch allow home app being instrumented while staring home from
PhoneWindowManager.
Bug:
129073085
Test: adb shell am instrument -w -r -e debug false -e log false -e class com.android.quickstep.TaplTestsQuickstep#testOverview com.google.android.apps.nexuslauncher.tests/androidx.test.runner.AndroidJUnitRunner
Change-Id: If6e2c748bed034866b3d4c3e40554c34373a333c
TreeHugger Robot [Fri, 22 Mar 2019 09:20:17 +0000 (09:20 +0000)]
Merge "Offloaded playback: use AudioAttributes in support check"
Treehugger Robot [Fri, 22 Mar 2019 09:14:14 +0000 (09:14 +0000)]
Merge "Renamed the variable"
Shawn Lin [Fri, 22 Mar 2019 08:58:57 +0000 (08:58 +0000)]
Merge "Fixed battery icon truncated on AOD mode"
Remi NGUYEN VAN [Fri, 22 Mar 2019 08:16:52 +0000 (17:16 +0900)]
Fix API in CaptivePortal and ConnectivityManager
- Remove CaptivePortal constructor from SystemApi. This constructor was
added in Q timeframe and ends up being unnecessary since
CaptivePortal creation was refactored to ConnectivityService because
of visibility issues on ICaptivePortal.
- Rename getAvoidBadWifi to shouldAvoidBadWifi
- Add permission annotation for shouldAvoidBadWifi
Test: flashed, WiFi and captive portal works
Bug:
128935314
Bug:
128935673
(clean cherry-pick of AOSP I7395d4a4db6a64398a827692aee1956c011873e5)
Change-Id: I09545c00af3519dbf141dd5951b28f49e37b3e80
TreeHugger Robot [Fri, 22 Mar 2019 08:14:13 +0000 (08:14 +0000)]
Merge "Allow app-level updates to video/audio timers"
Robert Shih [Fri, 22 Mar 2019 07:44:20 +0000 (07:44 +0000)]
Merge "MediaPlayer2 DRM: API improvements"
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:21:21 +0000 (00:21 -0700)]
Merge "Fix targetSdkVersion for NetworkStack" am:
42b97de9d3
am:
ba2f3d2fdf
Change-Id: I7be8a9f1020d56cdf9ac87a47a25cab77d66958e
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:12:43 +0000 (00:12 -0700)]
Merge "Fix targetSdkVersion for NetworkStack"
am:
42b97de9d3
Change-Id: Id9786b9d607950990427316379c3bb46bf188703
Remi NGUYEN VAN [Fri, 22 Mar 2019 07:00:50 +0000 (07:00 +0000)]
Merge "Fix targetSdkVersion for NetworkStack"
Xiangyu/Malcolm Chen [Fri, 22 Mar 2019 06:48:24 +0000 (06:48 +0000)]
Merge changes from topics "
128902411", "
128645056"
* changes:
API Feedback for CBRS
Remove clearDefaultsForInactiveSubIds.
TreeHugger Robot [Fri, 22 Mar 2019 06:37:36 +0000 (06:37 +0000)]
Merge "Add intent action constant to zen access setting page"
Hall Liu [Fri, 22 Mar 2019 06:17:16 +0000 (23:17 -0700)]
Merge "Add NETWORK_SCAN permission" am:
419956210a
am:
3f7de4bc99
Change-Id: Ic69dd3d51ac2038ff5291ec6ce3bd176c66b9d31
Hall Liu [Fri, 22 Mar 2019 06:02:09 +0000 (23:02 -0700)]
Merge "Add NETWORK_SCAN permission"
am:
419956210a
Change-Id: Ia9fe0ff68145e1a6bbb5bd903012e1ecb57a3d0b
Hall Liu [Fri, 22 Mar 2019 05:44:10 +0000 (05:44 +0000)]
Merge "Add NETWORK_SCAN permission"
Hall Liu [Thu, 21 Mar 2019 23:08:03 +0000 (16:08 -0700)]
Add NETWORK_SCAN permission
Bug:
126779616
Test: compiles
Change-Id: I2dd4beffca3afdcc0a0f071404ff62747faa3877
Merged-In: I2dd4beffca3afdcc0a0f071404ff62747faa3877
TreeHugger Robot [Fri, 22 Mar 2019 05:43:36 +0000 (05:43 +0000)]
Merge "Reland "Make Paint default to filtering Bitmaps""
Hall Liu [Fri, 22 Mar 2019 05:43:07 +0000 (05:43 +0000)]
Merge "Add NETWORK_SCAN permission"
Kevin Chyn [Fri, 22 Mar 2019 05:41:21 +0000 (05:41 +0000)]
Merge "Fixed talkback issue with biometric dialog."
Hyundo Moon [Fri, 22 Mar 2019 05:30:13 +0000 (05:30 +0000)]
Merge "Remove MediaSessionEngine"
Dongwon Kang [Fri, 22 Mar 2019 04:38:57 +0000 (21:38 -0700)]
Use ProxyFileDescriptorCallback instead of DataSourceCallback
Test: MediaPlayer2Test
Bug:
128461264, Bug:
126701061
Change-Id: Id971c77bf9a3003e2f24b716ad784b5f2f56f55f
TreeHugger Robot [Fri, 22 Mar 2019 04:56:16 +0000 (04:56 +0000)]
Merge "AccessibilityRequestPreparer shouldn't crash if the view is released before the preparer is added or removed."
Malcolm Chen [Thu, 21 Mar 2019 03:32:27 +0000 (20:32 -0700)]
API Feedback for CBRS
Bug:
128902411
Test: unittest
Change-Id: I2476834a5048d0e3c2c3413d7168a7a3ad2d7042
Lucas Lin [Fri, 22 Mar 2019 04:40:39 +0000 (21:40 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog" am:
507d69d5d9
am:
e2f6ad6b48
Change-Id: I2e1947cdf6e084aefd4d2ccd7b345df79c62e383
Lucas Lin [Fri, 22 Mar 2019 04:30:48 +0000 (21:30 -0700)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
am:
507d69d5d9
Change-Id: I88ca44ef0c0a7cf48538421022d0fed10d15fc26
Jean-Michel Trivi [Thu, 21 Mar 2019 23:08:50 +0000 (16:08 -0700)]
Offloaded playback: use AudioAttributes in support check
AudioAttributes can influence offload support, add them in
method to check for support
Bug:
86837964
Test: cts-tradefed run cts -m CtsMediaTestCases -t android.media.cts.AudioTrackOffloadTest#testAudioTrackOffload
Change-Id: If4037d0611ec1264d23d1779b9ac6efd9fd1244c
TreeHugger Robot [Fri, 22 Mar 2019 04:19:44 +0000 (04:19 +0000)]
Merge "Use VkAndroidHardwareBufferUsageANDROID to compute HWUI usage flags"
Stan Iliev [Fri, 22 Mar 2019 04:19:29 +0000 (04:19 +0000)]
Merge changes from topic "vkDequeueReleaseFence"
* changes:
Block GPU on dequeue fence only if it has not signalled already
Block GPU on release fence from dequeueBuffer earlier
Lucas Lin [Fri, 22 Mar 2019 04:17:43 +0000 (04:17 +0000)]
Merge "Enable PARTIAL_CONNECTIVITY dialog"
Luke Huang [Fri, 22 Mar 2019 04:13:29 +0000 (21:13 -0700)]
Merge "Support query cancellation for async DNS API" am:
aed6ea52de
am:
c19f41b2b2
Change-Id: I890bbb94bf1b8e2242efeb5c868e289a8ae4a95d
TreeHugger Robot [Fri, 22 Mar 2019 04:09:18 +0000 (04:09 +0000)]
Merge "Add logging for bouncer dismissal reasons."
Robert Shih [Wed, 20 Mar 2019 21:48:18 +0000 (14:48 -0700)]
MediaPlayer2: use TrackInfo based track APIs
Updated APIs include:
* MediaPlayer2.SubtitleData
* MediaPlayer2.selectTrack
* MediaPlayer2.deselectTrack
* MediaPlayer2.getSelectedTrack
Bug:
129098908
Test: android.media.cts.MediaPlayer2Test
Change-Id: Ib1de8b947959bebeae2a79977e055f82cfff67b7
TreeHugger Robot [Fri, 22 Mar 2019 03:57:26 +0000 (03:57 +0000)]
Merge "Raster and badge directshare with IconFactory"
TreeHugger Robot [Fri, 22 Mar 2019 03:51:16 +0000 (03:51 +0000)]
Merge "Remove unnecessary called from system process warning."
Luke Huang [Fri, 22 Mar 2019 03:50:18 +0000 (20:50 -0700)]
Merge "Support query cancellation for async DNS API"
am:
aed6ea52de
Change-Id: I400d98e13cf36ca16c3743eddee96bfae4b47b5c
Robert Shih [Wed, 20 Mar 2019 06:06:39 +0000 (23:06 -0700)]
MediaPlayer2 DRM: API improvements
* Document how to build valid DrmPreparationInfo
* Add getters for DrmPreparationInfo
* Make DrmEventCallback an abstract class
* Document set/clearDrmEventCallback are synchronous
Bug:
128548364
Test: build
Change-Id: Iecc2a8bcd410ea729ac9fd4c2b3f1428fc4b5e7d
Luke Huang [Fri, 22 Mar 2019 03:26:21 +0000 (03:26 +0000)]
Merge "Support query cancellation for async DNS API"
Michael Wachenschwanz [Fri, 22 Mar 2019 03:20:37 +0000 (03:20 +0000)]
Merge "Add EXTRA_DROPPED_COUNT for ACTION_DROPBOX_ENTRY_ADDED"
Alex Salo [Fri, 22 Mar 2019 03:18:12 +0000 (03:18 +0000)]
Merge "Add disableSelf() and more failure codes"
TreeHugger Robot [Fri, 22 Mar 2019 03:04:24 +0000 (03:04 +0000)]
Merge "Game Driver Metrics: update meta data naming for driver build time"
Lorenzo Colitti [Fri, 22 Mar 2019 03:02:50 +0000 (12:02 +0900)]
resolve merge conflicts of
0569184dc0336873ecae5d7ae6210393f9e27282 to master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I3af8ee8a7d8a4ff9dca0195b1947679cc09b2e89