OSDN Git Service

android-x86/frameworks-base.git
5 years agoFill elapsedRealtime fields in GnssClock
Yu-Han Yang [Thu, 21 Mar 2019 00:02:53 +0000 (17:02 -0700)]
Fill elapsedRealtime fields in GnssClock

Bug: 128713045
Test: tested on cuttlefish
Change-Id: Ied4570ec58399709bf83f5212727702fecdd1a73

5 years agoMerge "Release bitmap reference right after Per85ComputeTask done its job."
Lucas Dupin [Fri, 22 Mar 2019 20:23:28 +0000 (20:23 +0000)]
Merge "Release bitmap reference right after Per85ComputeTask done its job."

5 years agoMerge "Restrict access to mGroupFlags."
TreeHugger Robot [Fri, 22 Mar 2019 20:22:16 +0000 (20:22 +0000)]
Merge "Restrict access to mGroupFlags."

5 years agoMerge "Restrict FLAG_SUPPORT_STATIC_TRANSFORMATIONS usage"
TreeHugger Robot [Fri, 22 Mar 2019 20:06:36 +0000 (20:06 +0000)]
Merge "Restrict FLAG_SUPPORT_STATIC_TRANSFORMATIONS usage"

5 years agoMerge "Fix for avatar tinting"
Fabian Kozynski [Fri, 22 Mar 2019 20:06:31 +0000 (20:06 +0000)]
Merge "Fix for avatar tinting"

5 years ago[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlyi...
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

5 years agoMerge "Changed strings for DND"
Fabian Kozynski [Fri, 22 Mar 2019 19:22:05 +0000 (19:22 +0000)]
Merge "Changed strings for DND"

5 years agoMerge changes from topic "sv-background"
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

5 years agoMerge "Fix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock"
TreeHugger Robot [Fri, 22 Mar 2019 19:18:45 +0000 (19:18 +0000)]
Merge "Fix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock"

5 years agoMerge "Wake up animation polish"
TreeHugger Robot [Fri, 22 Mar 2019 19:15:43 +0000 (19:15 +0000)]
Merge "Wake up animation polish"

5 years agoMerge "Restrict access to View's hierarchy listener."
TreeHugger Robot [Fri, 22 Mar 2019 19:09:45 +0000 (19:09 +0000)]
Merge "Restrict access to View's hierarchy listener."

5 years agoMerge changes from topic "am-4b90382f938f437a92b13e188f18d8ed"
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

5 years ago[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying...
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

5 years ago[automerger skipped] Merge "Revert "Revert "Update VPN capabilities when its underlyi...
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

5 years ago[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkSta...
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

5 years agoMerge "Ignore disallowed adjustments"
TreeHugger Robot [Fri, 22 Mar 2019 19:01:21 +0000 (19:01 +0000)]
Merge "Ignore disallowed adjustments"

5 years ago[automerger skipped] Revert "Revert "Update VPN capabilities when its underlying...
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

5 years ago[automerger skipped] Merge "Remove ConnectivityManager and its usages from NetworkSta...
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

5 years agoMerge "New method ContentCaptureManager.getServiceSettingsComponentName()"
TreeHugger Robot [Fri, 22 Mar 2019 18:35:58 +0000 (18:35 +0000)]
Merge "New method ContentCaptureManager.getServiceSettingsComponentName()"

5 years agoMerge "Restrict accesss to FLAG_DISALLOW_INTERCEPT"
TreeHugger Robot [Fri, 22 Mar 2019 18:35:26 +0000 (18:35 +0000)]
Merge "Restrict accesss to FLAG_DISALLOW_INTERCEPT"

5 years agoMerge "Add elapasedRealtimeNanos and elapsedRealtimeUncertaintyNanos to GnssClock"
TreeHugger Robot [Fri, 22 Mar 2019 18:04:53 +0000 (18:04 +0000)]
Merge "Add elapasedRealtimeNanos and elapsedRealtimeUncertaintyNanos to GnssClock"

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS" am: dedc27142...
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

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS" am: dedc27142d
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

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS"
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

5 years agoMerge "Update BubbleMetadata#setDesiredHeight to be in DPs"
Mady Mellor [Fri, 22 Mar 2019 17:31:16 +0000 (17:31 +0000)]
Merge "Update BubbleMetadata#setDesiredHeight to be in DPs"

5 years agoMerge "Remove the title API bc we don't use it"
Mady Mellor [Fri, 22 Mar 2019 17:30:41 +0000 (17:30 +0000)]
Merge "Remove the title API bc we don't use it"

5 years agoMerge "Move mAugmentedAutofillResolver to AutofillManagerService instead."
Adam He [Fri, 22 Mar 2019 17:24:49 +0000 (17:24 +0000)]
Merge "Move mAugmentedAutofillResolver to AutofillManagerService instead."

5 years agoMerge "Introduce new service bind flag to permit capabilities"
TreeHugger Robot [Fri, 22 Mar 2019 17:23:48 +0000 (17:23 +0000)]
Merge "Introduce new service bind flag to permit capabilities"

5 years agoMerge "API review followup: DynamicAndroidClient"
TreeHugger Robot [Fri, 22 Mar 2019 17:21:39 +0000 (17:21 +0000)]
Merge "API review followup: DynamicAndroidClient"

5 years agoMerge "Query isEmergencySmsMode API when checking if emergency for GPS"
Brad Ebinger [Fri, 22 Mar 2019 17:18:47 +0000 (17:18 +0000)]
Merge "Query isEmergencySmsMode API when checking if emergency for GPS"

5 years agoMerge "Renamed DataSpecificRegistrationState"
TreeHugger Robot [Fri, 22 Mar 2019 17:10:40 +0000 (17:10 +0000)]
Merge "Renamed DataSpecificRegistrationState"

5 years agoMerge "Add logging for biometric authentication."
TreeHugger Robot [Fri, 22 Mar 2019 16:55:34 +0000 (16:55 +0000)]
Merge "Add logging for biometric authentication."

5 years agoFix SecurityException when calling DevicePolicyManager.setMaximumTimeToLock
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

5 years agoMerge "Allow home app being instrumented while starting home from PhoneWindowManager"
TreeHugger Robot [Fri, 22 Mar 2019 16:30:08 +0000 (16:30 +0000)]
Merge "Allow home app being instrumented while starting home from PhoneWindowManager"

5 years agoMerge "Wifi Usability: address comments from API review council"
Kai Shi [Fri, 22 Mar 2019 16:21:35 +0000 (16:21 +0000)]
Merge "Wifi Usability: address comments from API review council"

5 years agoFix for avatar tinting
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

5 years agoMerge "Move TEXT_HANDLE_MOVE and CLOCK_TICK to TEXTURE_TICK."
Michael Wright [Fri, 22 Mar 2019 16:21:15 +0000 (16:21 +0000)]
Merge "Move TEXT_HANDLE_MOVE and CLOCK_TICK to TEXTURE_TICK."

5 years agoMerge "Change existing LockPatternUtil APIs to fail untrusted password updates."
Irina Dumitrescu [Fri, 22 Mar 2019 16:12:39 +0000 (16:12 +0000)]
Merge "Change existing LockPatternUtil APIs to fail untrusted password updates."

5 years agoMerge "Adding AHardwareBuffer lockAndGetInfo to libandroid"
Valerie Hau [Fri, 22 Mar 2019 16:11:20 +0000 (16:11 +0000)]
Merge "Adding AHardwareBuffer lockAndGetInfo to libandroid"

5 years agoMerge "Ignore prox data when it's obsolete"
Lucas Dupin [Fri, 22 Mar 2019 16:11:05 +0000 (16:11 +0000)]
Merge "Ignore prox data when it's obsolete"

5 years agoMerge "Call ClockPlugin#onTimeTick on lock screen"
TreeHugger Robot [Fri, 22 Mar 2019 16:09:30 +0000 (16:09 +0000)]
Merge "Call ClockPlugin#onTimeTick on lock screen"

5 years agoChange existing LockPatternUtil APIs to fail untrusted password updates.
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

5 years agoMerge "API changes in MicrophoneDirection"
Eric Laurent [Fri, 22 Mar 2019 15:57:49 +0000 (15:57 +0000)]
Merge "API changes in MicrophoneDirection"

5 years agoMerge "Updating the AppTarget API to use a builder for constuction"
Sunny Goyal [Fri, 22 Mar 2019 15:55:17 +0000 (15:55 +0000)]
Merge "Updating the AppTarget API to use a builder for constuction"

5 years agoMerge "API council feedback for dnd"
TreeHugger Robot [Fri, 22 Mar 2019 15:53:32 +0000 (15:53 +0000)]
Merge "API council feedback for dnd"

5 years agoMerge "Skip the target activity when settings state to disallow sysui flags"
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"

5 years agoMerge "Respond to API feedback on DIRECTORY columns."
Jeff Sharkey [Fri, 22 Mar 2019 15:28:17 +0000 (15:28 +0000)]
Merge "Respond to API feedback on DIRECTORY columns."

5 years agoMerge "Updating onLocation related APIs to onLaunchLocation as per API review"
TreeHugger Robot [Fri, 22 Mar 2019 15:24:29 +0000 (15:24 +0000)]
Merge "Updating onLocation related APIs to onLaunchLocation as per API review"

5 years agoWifi Usability: address comments from API review council
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

5 years agoMerge "Adds PhysicsPropertyAnimator, which simplifies animation controllers."
Josh Tsuji [Fri, 22 Mar 2019 15:19:00 +0000 (15:19 +0000)]
Merge "Adds PhysicsPropertyAnimator, which simplifies animation controllers."

5 years agoMerge "OverlayManager API fixes"
Hyunyoung Song [Fri, 22 Mar 2019 15:07:19 +0000 (15:07 +0000)]
Merge "OverlayManager API fixes"

5 years agoMerge "More apps making assumptions about MediaStore."
Jeff Sharkey [Fri, 22 Mar 2019 15:04:55 +0000 (15:04 +0000)]
Merge "More apps making assumptions about MediaStore."

5 years agoMerge "Documentation based on API council feedback."
Jeff Sharkey [Fri, 22 Mar 2019 15:04:50 +0000 (15:04 +0000)]
Merge "Documentation based on API council feedback."

5 years agoMove TEXT_HANDLE_MOVE and CLOCK_TICK to TEXTURE_TICK.
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

5 years agoMerge "Remove TEST_MANAGE_ROLLBACKS permission from @SystemApi"
Richard Uhler [Fri, 22 Mar 2019 14:26:01 +0000 (14:26 +0000)]
Merge "Remove TEST_MANAGE_ROLLBACKS permission from @SystemApi"

5 years agoMerge "MediaProjection: Temporarily disable f/g service requirement."
TreeHugger Robot [Fri, 22 Mar 2019 14:07:28 +0000 (14:07 +0000)]
Merge "MediaProjection: Temporarily disable f/g service requirement."

5 years agoMerge changes from topic "non-zygote"
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.

5 years agoMerge "Visual changes to QS."
Fabian Kozynski [Fri, 22 Mar 2019 13:52:21 +0000 (13:52 +0000)]
Merge "Visual changes to QS."

5 years ago[automerger skipped] Merge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee...
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

5 years agoMerge "Add @UnsupportedAppUsage annotations" am: 88e2a9aaee
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

5 years agoMerge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:25:44 +0000 (06:25 -0700)]
Merge "Add @UnsupportedAppUsage annotations"
am: 88e2a9aaee

Change-Id: I63ae22279aa46522b652cdc9329567a04a7ef136

5 years agoMerge "Add @UnsupportedAppUsage annotations"
Andrei-Valentin Onea [Fri, 22 Mar 2019 13:12:41 +0000 (13:12 +0000)]
Merge "Add @UnsupportedAppUsage annotations"

5 years agoMerge "Sharesheet - Support landscape mode"
TreeHugger Robot [Fri, 22 Mar 2019 12:31:22 +0000 (12:31 +0000)]
Merge "Sharesheet - Support landscape mode"

5 years agoMerge "MediaPlayer2: use TrackInfo based track APIs"
Dongwon Kang [Fri, 22 Mar 2019 12:30:00 +0000 (12:30 +0000)]
Merge "MediaPlayer2: use TrackInfo based track APIs"

5 years agoMerge "Use ProxyFileDescriptorCallback instead of DataSourceCallback"
Dongwon Kang [Fri, 22 Mar 2019 12:29:35 +0000 (12:29 +0000)]
Merge "Use ProxyFileDescriptorCallback instead of DataSourceCallback"

5 years ago[automerger skipped] Merge "Add telephony sources to hiddenapi-mappings" am: 824c5313...
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

5 years agoMerge "Add Looper.prepare() to doInBackground()"
TreeHugger Robot [Fri, 22 Mar 2019 11:51:48 +0000 (11:51 +0000)]
Merge "Add Looper.prepare() to doInBackground()"

5 years agoMerge "Fix API in CaptivePortal and ConnectivityManager"
Lorenzo Colitti [Fri, 22 Mar 2019 11:46:21 +0000 (11:46 +0000)]
Merge "Fix API in CaptivePortal and ConnectivityManager"

5 years agoMerge "Add telephony sources to hiddenapi-mappings" am: 824c531396
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

5 years agoAdd @UnsupportedAppUsage annotations
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

5 years agoAdd Looper.prepare() to doInBackground()
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

5 years agoMerge "Add telephony sources to hiddenapi-mappings"
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

5 years agoMerge "Add telephony sources to hiddenapi-mappings"
Andrei-Valentin Onea [Fri, 22 Mar 2019 11:24:50 +0000 (11:24 +0000)]
Merge "Add telephony sources to hiddenapi-mappings"

5 years ago[automerger skipped] Merge "Renamed the variable" am: afa94f4664 am: f2a8ea192c
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

5 years agoMerge "Improve javadoc"
Rubin Xu [Fri, 22 Mar 2019 11:12:21 +0000 (11:12 +0000)]
Merge "Improve javadoc"

5 years agoMerge "Fix targetSdkVersion for NetworkStack" am: 42b97de9d3 am: ba2f3d2fdf
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

5 years ago[automerger skipped] Merge "Add NETWORK_SCAN permission" am: 419956210a am: 3f7de4bc99
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

5 years agoMerge "Enable PARTIAL_CONNECTIVITY dialog" am: 507d69d5d9 am: e2f6ad6b48
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

5 years agoMerge "Merge "Support query cancellation for async DNS API" am: aed6ea52de am: c19f41...
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"

5 years agoMerge "Support query cancellation for async DNS API" am: aed6ea52de am: c19f41b2b2
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

5 years agoMerge "SystemUI: Update styling of media projection permission dialog."
Narayan Kamath [Fri, 22 Mar 2019 10:29:59 +0000 (10:29 +0000)]
Merge "SystemUI: Update styling of media projection permission dialog."

5 years ago[automerger skipped] Merge "Modify SettingsLib for partial connectivity" am: 64bb980f...
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

5 years agoMerge "[automerger skipped] Merge changes from topic "iwlan_api_review" am: ac3406f9c...
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"

5 years ago[automerger skipped] Merge changes from topic "iwlan_api_review" am: ac3406f9c6 am...
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

5 years agoMerge "Fix activities cannot be resumed when non-secure keyguard shown"
TreeHugger Robot [Fri, 22 Mar 2019 10:03:29 +0000 (10:03 +0000)]
Merge "Fix activities cannot be resumed when non-secure keyguard shown"

5 years agoMerge "Fix build due to no explanatory comment." am: 0b6c77167e am: 7d73c0b4d6
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

5 years agoMerge "resolve merge conflicts of 0569184dc0336873ecae5d7ae6210393f9e27282 to master"
TreeHugger Robot [Fri, 22 Mar 2019 09:46:14 +0000 (09:46 +0000)]
Merge "resolve merge conflicts of 0569184dc0336873ecae5d7ae6210393f9e27282 to master"

5 years agoMerge "Add getDeclaredShareLibraries() for role qualification checking."
Hai Zhang [Fri, 22 Mar 2019 09:43:48 +0000 (09:43 +0000)]
Merge "Add getDeclaredShareLibraries() for role qualification checking."

5 years agoMerge "Add network stack proto"
Chiachang Wang [Fri, 22 Mar 2019 09:43:40 +0000 (09:43 +0000)]
Merge "Add network stack proto"

5 years agoMerge "Bubble permission prompt - set theme font"
TreeHugger Robot [Fri, 22 Mar 2019 09:42:22 +0000 (09:42 +0000)]
Merge "Bubble permission prompt - set theme font"

5 years agoMerge "Renamed the variable" am: afa94f4664
Jack Yu [Fri, 22 Mar 2019 09:41:17 +0000 (02:41 -0700)]
Merge "Renamed the variable" am: afa94f4664
am: f2a8ea192c

Change-Id: I915e00c7392e31180099abf35982cc1a5a3ffc17

5 years agoMerge "Renamed the variable"
Jack Yu [Fri, 22 Mar 2019 09:32:18 +0000 (02:32 -0700)]
Merge "Renamed the variable"
am: afa94f4664

Change-Id: I688d8126bb0207f8efcccba3e9857144e3f6067b

5 years agoAllow home app being instrumented while starting home from PhoneWindowManager
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

5 years agoMerge "Offloaded playback: use AudioAttributes in support check"
TreeHugger Robot [Fri, 22 Mar 2019 09:20:17 +0000 (09:20 +0000)]
Merge "Offloaded playback: use AudioAttributes in support check"

5 years agoMerge "Renamed the variable"
Treehugger Robot [Fri, 22 Mar 2019 09:14:14 +0000 (09:14 +0000)]
Merge "Renamed the variable"

5 years agoMerge "Fixed battery icon truncated on AOD mode"
Shawn Lin [Fri, 22 Mar 2019 08:58:57 +0000 (08:58 +0000)]
Merge "Fixed battery icon truncated on AOD mode"

5 years agoFix API in CaptivePortal and ConnectivityManager
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

5 years agoMerge "Allow app-level updates to video/audio timers"
TreeHugger Robot [Fri, 22 Mar 2019 08:14:13 +0000 (08:14 +0000)]
Merge "Allow app-level updates to video/audio timers"

5 years agoMerge "MediaPlayer2 DRM: API improvements"
Robert Shih [Fri, 22 Mar 2019 07:44:20 +0000 (07:44 +0000)]
Merge "MediaPlayer2 DRM: API improvements"

5 years agoMerge "Fix targetSdkVersion for NetworkStack" am: 42b97de9d3
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