OSDN Git Service
TreeHugger Robot [Fri, 22 Mar 2019 22:04:20 +0000 (22:04 +0000)]
Merge "Refresh TextClock on doze time tick alarm."
TreeHugger Robot [Fri, 22 Mar 2019 21:57:10 +0000 (21:57 +0000)]
Merge "Do not run create on successive reboots"
Felipe Leme [Fri, 22 Mar 2019 21:53:34 +0000 (21:53 +0000)]
Merge "Renamed ContentCaptureService.disableContentCaptureServices to disableSelf()"
Anthony Tripaldi [Fri, 22 Mar 2019 21:53:11 +0000 (21:53 +0000)]
Merge "Add a new Secure Setting check for current opted-out state of captions."
Ryan Mitchell [Fri, 22 Mar 2019 21:39:41 +0000 (21:39 +0000)]
Merge "Add targetOverlayableName to OverlayInfo"
TreeHugger Robot [Fri, 22 Mar 2019 21:33:22 +0000 (21:33 +0000)]
Merge "Sharesheet - Resolve crash when no targets are present"
Philip P. Moltmann [Fri, 22 Mar 2019 21:27:08 +0000 (21:27 +0000)]
Merge "Do not force review of hidden permissions"
TreeHugger Robot [Fri, 22 Mar 2019 21:24:39 +0000 (21:24 +0000)]
Merge "Fixed "adb shell dumpsys location" NullPointerException. If dumpsys is called before systemRunning(), then NullPointerException is thrown because of null member variables."
George Lu [Thu, 14 Mar 2019 00:11:21 +0000 (17:11 -0700)]
Revise BroadcastRadioService handling of V2 HALs
Previously, BroadcastRadioService checked for HALs (both V1 and V2)
exactly once, the first time listModules() was called. This approach
failed to handle HALs that registered after boot or that died and restarted.
This change addresses both issues by registering a listener that is
invoked when V2 HALs are registered. Additionally, the check for V1 HALs
now occurs at construction time.
Bug:
121006324
Bug:
126887436
Test: Verified on device BroadcastRadioService handles V1 HALs properly and picks up V2 HALs dynamically
Change-Id: Id9df7f53d189801f0a0dc894b2bb425d655edbd6
Winson Chung [Fri, 22 Mar 2019 21:02:07 +0000 (21:02 +0000)]
Merge "Add overlays for nav bar interaction mode."
Salvador Martinez [Fri, 22 Mar 2019 20:52:13 +0000 (20:52 +0000)]
Merge "Update names of dynamic power saver mode APIs"
Lucas Dupin [Fri, 22 Mar 2019 20:23:28 +0000 (20:23 +0000)]
Merge "Release bitmap reference right after Per85ComputeTask done its job."
TreeHugger Robot [Fri, 22 Mar 2019 20:22:16 +0000 (20:22 +0000)]
Merge "Restrict access to mGroupFlags."
TreeHugger Robot [Fri, 22 Mar 2019 20:06:36 +0000 (20:06 +0000)]
Merge "Restrict FLAG_SUPPORT_STATIC_TRANSFORMATIONS usage"
Fabian Kozynski [Fri, 22 Mar 2019 20:06:31 +0000 (20:06 +0000)]
Merge "Fix for avatar tinting"
Varun Anand [Fri, 22 Mar 2019 19:37:54 +0000 (12:37 -0700)]
[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev am:
ddaa6338c8 -s ours
am:
1b8dfb3982 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: Ibe57fcb06756943987e70b7e38e57a07f71de4e6
Fabian Kozynski [Fri, 22 Mar 2019 19:22:05 +0000 (19:22 +0000)]
Merge "Changed strings for DND"
Rob Carr [Fri, 22 Mar 2019 19:21:59 +0000 (19:21 +0000)]
Merge changes from topic "sv-background"
* changes:
SurfaceView: Only show background when behind ViewRoot.
SurfaceControl: Respond to more API Feedback
TreeHugger Robot [Fri, 22 Mar 2019 19:18:45 +0000 (19:18 +0000)]
Merge "Fix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock"
TreeHugger Robot [Fri, 22 Mar 2019 19:15:43 +0000 (19:15 +0000)]
Merge "Wake up animation polish"
TreeHugger Robot [Fri, 22 Mar 2019 19:09:45 +0000 (19:09 +0000)]
Merge "Restrict access to View's hierarchy listener."
Android Build Merger (Role) [Fri, 22 Mar 2019 19:07:18 +0000 (19:07 +0000)]
Merge changes from topic "am-
4b90382f938f437a92b13e188f18d8ed"
* changes:
[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am:
9f98789d3f -s ours am:
a8056e3fb8 -s ours am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am:
a24113f030 -s ours am:
c14d2102db -s ours am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1
02c50ef1d1 is in history
Varun Anand [Fri, 22 Mar 2019 19:06:23 +0000 (12:06 -0700)]
[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null."" am:
9f98789d3f -s ours
am:
a8056e3fb8 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: I020ffc31fb0ef41332df37110bb0a8b01e76c976
Varun Anand [Fri, 22 Mar 2019 19:02:13 +0000 (12:02 -0700)]
[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlying network set is null.""" into pi-dev
am:
ddaa6338c8 -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: I0634f41f9b3be7cc640b31ab3067708f99759831
Varun Anand [Fri, 22 Mar 2019 19:02:12 +0000 (12:02 -0700)]
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev am:
a24113f030 -s ours
am:
c14d2102db -s ours
am skip reason: change_id I57e117bb4e9efe491b19d6b5a479f2d58d1c58e6 with SHA1
02c50ef1d1 is in history
Change-Id: I34c36c55ba985118ffc2210b2e05daab2a0ea8e8
TreeHugger Robot [Fri, 22 Mar 2019 19:01:21 +0000 (19:01 +0000)]
Merge "Ignore disallowed adjustments"
Varun Anand [Fri, 22 Mar 2019 18:45:16 +0000 (11:45 -0700)]
[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying network set is null.""
am:
9f98789d3f -s ours
am skip reason: change_id Id0abc4d304bb096e92479a118168690ccce634ed with SHA1
4fa80e8a2f is in history
Change-Id: I98242257e569eeac747c0328dfa6381e49e7c0b0
Varun Anand [Fri, 22 Mar 2019 18:39:41 +0000 (11:39 -0700)]
[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkStatsService." into pi-dev
am:
a24113f030 -s ours
am skip reason: SHA1
a24113f030 skipped by user vaanand
Change-Id: Ieee5f28f6d10b0d2b8a7b3eb0272297f148ef03f
TreeHugger Robot [Fri, 22 Mar 2019 18:35:58 +0000 (18:35 +0000)]
Merge "New method ContentCaptureManager.getServiceSettingsComponentName()"
TreeHugger Robot [Fri, 22 Mar 2019 18:35:26 +0000 (18:35 +0000)]
Merge "Restrict accesss to FLAG_DISALLOW_INTERCEPT"
Winson Chung [Tue, 5 Mar 2019 19:10:12 +0000 (11:10 -0800)]
Add overlays for nav bar interaction mode.
- Add config for nav bar interaction mode
- Add overlay packages for overriding the nav bar interaction mode
- Migrate existing swipe up setting into the resource overlay
P2 P->Q:
def/off -> 3 button overlay enabled (from default)
set on -> 2 button overlay enabled (from setting)
P3 (default on):
def (setting not exposed) -> 2 button overlay enabled (from default)
Bug:
127366543
Test: adb shell cmd overlay dump
Change-Id: I75590f81d9dd6a017776e0a34c295575bfe1bf2a
TreeHugger Robot [Fri, 22 Mar 2019 18:04:53 +0000 (18:04 +0000)]
Merge "Add elapasedRealtimeNanos and elapsedRealtimeUncertaintyNanos to GnssClock"
Brad Ebinger [Fri, 22 Mar 2019 17:59:52 +0000 (10:59 -0700)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS" am:
dedc27142d am:
3b176bc1de
am:
6862694d61
Change-Id: Id37265bae6fc641b77073c16b5a1b9a54a49b750
Tyler Trephan [Thu, 21 Mar 2019 17:54:22 +0000 (10:54 -0700)]
Fixed "adb shell dumpsys location" NullPointerException. If dumpsys is called before systemRunning(), then NullPointerException is thrown because of null member variables.
Test: Tested on Hawk.
Fix:
128919170
Change-Id: I66097d94443bb18fa87e2f00c44901c772a1b851
Brad Ebinger [Fri, 22 Mar 2019 17:48:18 +0000 (10:48 -0700)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS" am:
dedc27142d
am:
3b176bc1de
Change-Id: I26112e78477a755fe0fd373a8fdbdceb864fcea0
Matt Pietal [Fri, 22 Mar 2019 17:11:46 +0000 (13:11 -0400)]
Sharesheet - Resolve crash when no targets are present
After the sharesheet closes, a timeout message propagates to a handler
for processing, which causes an NPE
Bug:
129137525
Test: atest ChooserActivityTest
Change-Id: I200b068b74998ce9d22d85ad3574c130f959de4f
Felipe Leme [Fri, 22 Mar 2019 17:29:30 +0000 (10:29 -0700)]
Renamed ContentCaptureService.disableContentCaptureServices to disableSelf()
Test: atest CtsContentCaptureServiceTestCases
Test: m update-api
Fixes:
128426640
Change-Id: I54c68ae64969f2e15c0c3a53cb6dbdb59b7931ab
Brad Ebinger [Fri, 22 Mar 2019 17:36:07 +0000 (10:36 -0700)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
am:
dedc27142d
Change-Id: Ieccb97fb300455e9338c022c46466bed355be79a
Mady Mellor [Fri, 22 Mar 2019 17:31:16 +0000 (17:31 +0000)]
Merge "Update BubbleMetadata#setDesiredHeight to be in DPs"
Mady Mellor [Fri, 22 Mar 2019 17:30:41 +0000 (17:30 +0000)]
Merge "Remove the title API bc we don't use it"
Adam He [Fri, 22 Mar 2019 17:24:49 +0000 (17:24 +0000)]
Merge "Move mAugmentedAutofillResolver to AutofillManagerService instead."
TreeHugger Robot [Fri, 22 Mar 2019 17:23:48 +0000 (17:23 +0000)]
Merge "Introduce new service bind flag to permit capabilities"
TreeHugger Robot [Fri, 22 Mar 2019 17:21:39 +0000 (17:21 +0000)]
Merge "API review followup: DynamicAndroidClient"
Brad Ebinger [Fri, 22 Mar 2019 17:18:47 +0000 (17:18 +0000)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"
Ryan Mitchell [Fri, 22 Mar 2019 16:09:20 +0000 (09:09 -0700)]
Do not run create on successive reboots
Passing policy flags to the Verify command of idmap2 was causing the
command to fail to parse and run create again even when the target and
overlay did not change. This change allows verify in scan to work
correctly again.
Bug:
127860892
Test: confirmed that create is not run on a successive reboot
Change-Id: I7b9c9d81c7aef6b4c80fb8b87a1e929e82fc3b84
Salvador Martinez [Wed, 20 Mar 2019 23:21:27 +0000 (16:21 -0700)]
Update names of dynamic power saver mode APIs
There was some confusion caused by the names so this CL
changes them to make the differentiation more clear hopefully.
Test: robotests pass, build runs, functionality of clients intact
Bug:
126944845
Change-Id: I626dd8e38c59fb5c061e4d0fdcf8c81701c459a3
TreeHugger Robot [Fri, 22 Mar 2019 17:10:40 +0000 (17:10 +0000)]
Merge "Renamed DataSpecificRegistrationState"
TreeHugger Robot [Fri, 22 Mar 2019 16:55:34 +0000 (16:55 +0000)]
Merge "Add logging for biometric authentication."
Rubin Xu [Fri, 22 Mar 2019 13:31:28 +0000 (13:31 +0000)]
Fix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testSecurityLoggingWithSingleUser (only on cuttlefish)
Change-Id: Icd8a24481c281842e9690c6e16c9c31d2d613a2c
Fix:
127264133
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"
Fabian Kozynski [Thu, 21 Mar 2019 17:47:17 +0000 (13:47 -0400)]
Fix for avatar tinting
Removes the accent color tinting of avatar in QSFooterImpl to
prevent tinting of custom user avatar.
Fixes:
128889592
Bug:
124466547
Test: manual
Change-Id: Ie473b1ebc200a3ceba7285ede2e7a199ff0942a0
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"
Anthony Tripaldi [Thu, 21 Mar 2019 17:50:59 +0000 (13:50 -0400)]
Add a new Secure Setting check for current opted-out state of captions.
Bug:
129066127
Test: manual
Change-Id: I511f5fdb140480ca49e340386d11510f69a5ef31
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"