Commit Graph

641690 Commits

Author SHA1 Message Date
Abel Tesfaye
7e82f476a1 Merge "Add LatencyTracker for CameraAutoRotate in RotationResolverManagerPerUserService" into sc-dev am: 784886816d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14238091

Change-Id: I62a56486928fab375bd599c14dfb625b45d6520f
2021-05-19 17:49:42 +00:00
Abel Tesfaye
784886816d Merge "Add LatencyTracker for CameraAutoRotate in RotationResolverManagerPerUserService" into sc-dev 2021-05-19 17:38:51 +00:00
Kevin Chyn
adf8f20fe0 Merge "Initialize mLastAcquire, and check against it in wasUserDetected" into sc-dev am: ab0c4fbc4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629487

Change-Id: Ice067fd3559cf207af8ec45df4eebbf1aabf1dbd
2021-05-19 17:33:32 +00:00
TreeHugger Robot
5e7737ad6f Merge "Correct AppWidget layout when WP is off" into sc-dev am: 175302bb89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14639850

Change-Id: Iafbccf5f44f8b21837a9f4955cabcb9ce39ebd64
2021-05-19 17:33:03 +00:00
Kevin Chyn
ab0c4fbc4f Merge "Initialize mLastAcquire, and check against it in wasUserDetected" into sc-dev 2021-05-19 17:28:39 +00:00
TreeHugger Robot
175302bb89 Merge "Correct AppWidget layout when WP is off" into sc-dev 2021-05-19 17:26:37 +00:00
Yi Jiang
2226d51b4e Merge "Adds unit tests for WOL." into sc-dev am: af8ef20fe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14627416

Change-Id: I71720d8df242bb4c1ca59f6d7504ce2983b63e5f
2021-05-19 17:25:00 +00:00
Yi Jiang
af8ef20fe7 Merge "Adds unit tests for WOL." into sc-dev 2021-05-19 17:04:44 +00:00
TreeHugger Robot
cc99a51dd5 Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev am: c6850e0a9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607397

Change-Id: I5a99cd8245fe536d9ccedf280e2babd21e50e250
2021-05-19 16:33:15 +00:00
TreeHugger Robot
c6850e0a9f Merge "Add a permission for CDM apps to start FGS from the background (2nd try)" into sc-dev 2021-05-19 16:27:04 +00:00
Jack Yu
8b5847dbc7 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev am: 365fb56a56
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550550

Change-Id: If0172ba0b1ba5ae58b9a355d0fdd57a058a0d1a9
2021-05-19 16:26:54 +00:00
Winson Chung
295004e6c5 Merge "Fix regression in app drag target windows" into sc-dev am: 90f649445f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637477

Change-Id: Iddf914f69e6f76dc1ea44aca44b7edcd2e1ab76f
2021-05-19 16:26:34 +00:00
Alex Johnston
45e95631bf Merge "Security logging broadcast work profile" into sc-dev am: e9614f06c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14543674

Change-Id: I9b663a119266fe0c9b070d594cfcec380967fcab
2021-05-19 16:26:22 +00:00
Jack Yu
365fb56a56 Merge "API Review: Rename CAPABILITY_ALLOWED_NETWORK_TYPES_USED" into sc-dev 2021-05-19 16:26:18 +00:00
Edgar Wang
6563317b22 Merge "Remove the maxLines of FooterPreference." into sc-dev am: f414073a73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14536869

Change-Id: I26dd7358917139a9272d7270865112ecba3915d4
2021-05-19 16:26:07 +00:00
Neil Fuller
f245f49e05 Merge "Add permission to shell for CTS test" into sc-dev am: bc9061fdf3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621137

Change-Id: I4ced22912f1f7d28342a30dbf8e61f3558785fef
2021-05-19 16:25:54 +00:00
Rahul Sabnis
f1f65ab7dc Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev am: b8cfbebbec
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14457502

Change-Id: I0cc8db6af04a343bb520176fbe8bd3a26780065b
2021-05-19 16:24:50 +00:00
Winson Chung
90f649445f Merge "Fix regression in app drag target windows" into sc-dev 2021-05-19 16:18:21 +00:00
Alex Johnston
e9614f06c4 Merge "Security logging broadcast work profile" into sc-dev 2021-05-19 16:17:24 +00:00
Edgar Wang
f414073a73 Merge "Remove the maxLines of FooterPreference." into sc-dev 2021-05-19 16:16:39 +00:00
Neil Fuller
bc9061fdf3 Merge "Add permission to shell for CTS test" into sc-dev 2021-05-19 16:11:12 +00:00
Rahul Sabnis
b8cfbebbec Merge "Update BluetoothDevice#setAlias based on API council feedback: now accepts null input and returns an int (with error codes). Update CompanionDeviceManager#canPairWithoutPrompt to take a UserHandle instead of an int. Adds BluetoothStatusCodes class for all new Bluetooth error / success codes. Moved OOB and hci disconnect constants to the new BluetoothStatusCodes class." into sc-dev 2021-05-19 16:00:04 +00:00
TreeHugger Robot
d95a9ebbfb Merge "Deprecate Context#createApplicationContext" into sc-dev am: ee438f960a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14528644

Change-Id: I9a5eeea6f94d3e4924d67013ec20c631bc85d62c
2021-05-19 15:41:50 +00:00
TreeHugger Robot
ee438f960a Merge "Deprecate Context#createApplicationContext" into sc-dev 2021-05-19 15:35:09 +00:00
Rubin Xu
d10d363e80 Merge "Send network & security logging callbacks in foreground" into sc-dev am: 68aa35b03d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14530944

Change-Id: I91fbfad40f7797d90b9ac7e658cf9c455da39121
2021-05-19 15:35:03 +00:00
TreeHugger Robot
5ee0f1c551 Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev am: 393cd159ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14640418

Change-Id: I7c0495d9390d34dd630579d19016328e01e5ef1d
2021-05-19 15:34:37 +00:00
Rubin Xu
68aa35b03d Merge "Send network & security logging callbacks in foreground" into sc-dev 2021-05-19 15:34:31 +00:00
Tiger Huang
19c08f146a Merge "Force showing navigation bar while IME is visible" into sc-dev am: a254d7fd43
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14486201

Change-Id: I827bda6b9dc86d9cc223c68d551a97b38a9a6af2
2021-05-19 15:34:15 +00:00
TreeHugger Robot
96dbff6fb2 Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e9a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344090

Change-Id: Ife3c273f30b0ec1863e3d3c5d726466613a6a762
2021-05-19 15:33:42 +00:00
TreeHugger Robot
393cd159ae Merge "Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."" into sc-dev 2021-05-19 15:31:56 +00:00
Tiger Huang
a254d7fd43 Merge "Force showing navigation bar while IME is visible" into sc-dev 2021-05-19 15:25:17 +00:00
TreeHugger Robot
cf5b205e9a Merge "Extend set user protected packages for multi-user" into sc-dev 2021-05-19 15:14:39 +00:00
Les Lee
aa6feb95bb Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 6fff3df429
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495

Change-Id: Ic72650951d9e03c5bb3c1861f4c39aac47065357
2021-05-19 14:50:04 +00:00
Zimuzo Ezeozue
b3e9d6bed9 Merge "Improve secondary volume mounts on user switch" into sc-dev am: 58b0886913
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621130

Change-Id: Idb37e8d04328e1ddd6d3da2fc2baba6a5d2e40db
2021-05-19 14:49:44 +00:00
Ryan Mitchell
7a987a6e97 Merge "Add <staging-public-group> tags to SV2" into sc-v2-dev 2021-05-19 14:45:44 +00:00
Les Lee
6fff3df429 Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev 2021-05-19 14:32:29 +00:00
Zimuzo Ezeozue
58b0886913 Merge "Improve secondary volume mounts on user switch" into sc-dev 2021-05-19 14:31:11 +00:00
Antoan Angelov
9530b4a0a7 Merge "SettingsLib logic for updated ActionDisabledByAdminDialogHelper" into sc-dev am: 392fd855a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550423

Change-Id: Icc59d6ebb2a64d064033b7298bd53c63e6a2b70d
2021-05-19 14:06:58 +00:00
Antoan Angelov
392fd855a4 Merge "SettingsLib logic for updated ActionDisabledByAdminDialogHelper" into sc-dev 2021-05-19 13:50:07 +00:00
Caitlin Cassidy
fadfb0bdad Merge "[Device Controls] For custom icons, keep the tint the icon comes with." into sc-dev am: 48f518618e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14589388

Change-Id: I332f67eb102157666ab11945e2117c803335d518
2021-05-19 13:33:55 +00:00
Ard Biesheuvel
e6c75ec2dc Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."
Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."

Revert "Remove GET_ACCOUNTS_PRIVILEGED from PermissionController."

Revert submission 14608710-pc-account-permission

Reason for revert:
Causes kernel presubmit breakage (b/188643368)
[avd/avd_boot_test_kernel_triggered-stable-host-image] DeviceBootTest.DeviceBootTest#DeviceBootTest

Reverted Changes:
I5ed894f7d:Remove GET_ACCOUNTS_PRIVILEGED from PermissionCont...
I2e765abb8:Remove GET_ACCOUNTS_PRIVILEGED from PermissionCont...
Ia11eb94f8:Remove GET_ACCOUNTS_PRIVILEGED from PermissionCont...

Change-Id: I5b3cd130e3d541cd2d97e74bd9da158c47dc0ea8
Bug: 188643368
2021-05-19 13:29:43 +00:00
Caitlin Cassidy
48f518618e Merge "[Device Controls] For custom icons, keep the tint the icon comes with." into sc-dev 2021-05-19 13:16:44 +00:00
TreeHugger Robot
d20b62d8e2 Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev am: c5efbf1dba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621133

Change-Id: I6c5761883c9491c9984abebe0b4b882a5c1755f1
2021-05-19 12:59:07 +00:00
TreeHugger Robot
c5efbf1dba Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev 2021-05-19 12:50:27 +00:00
Junyu Lai
0069e7e222 Merge changes I3ba50cbd,I970ee365 into sc-dev am: b987babf5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500

Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70
2021-05-19 12:41:44 +00:00
junyulai
cfea2411e2 [FUI27] Fix internal naming of notifyNetworkStatus am: 0c7c578433
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562499

Change-Id: I4671975978f6f07b32a7e7b4507f82600d454739
2021-05-19 12:41:40 +00:00
Junyu Lai
b987babf5e Merge changes I3ba50cbd,I970ee365 into sc-dev
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus
2021-05-19 12:36:03 +00:00
Beverly Tai
5283548af8 Merge "onFinished, update scrim based on lastState" into sc-dev am: 161bec7e1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14624413

Change-Id: I32b10ed95bf568ac80590ce2f4baa025e0a5164a
2021-05-19 12:31:52 +00:00
TreeHugger Robot
7c31aa3826 Merge "Changed behavior of DPMS.setLocationEnabled() for automotive." into sc-dev am: cf2f6ff89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14525263

Change-Id: I6c73265fa86148bda8fc44047fa6c6b86b6023cb
2021-05-19 12:31:42 +00:00
Beverly Tai
161bec7e1d Merge "onFinished, update scrim based on lastState" into sc-dev 2021-05-19 12:20:38 +00:00