Commit Graph

653031 Commits

Author SHA1 Message Date
Treehugger Robot
c978bf0e0a Merge "AdbService sends callback on adb debugging enabled / disabled." am: 6efa908b95 am: 870e9c266b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775965

Change-Id: I54a60b127532a7a8ea4f20c597789362ac2eb47f
2021-08-10 04:26:31 +00:00
Treehugger Robot
870e9c266b Merge "AdbService sends callback on adb debugging enabled / disabled." am: 6efa908b95
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1775965

Change-Id: I9598e35ce96a5dec832360071c8bc4c9012e7dc0
2021-08-10 04:13:48 +00:00
Treehugger Robot
6efa908b95 Merge "AdbService sends callback on adb debugging enabled / disabled." 2021-08-10 04:03:11 +00:00
Treehugger Robot
a883c2c975 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: e9e1f5afa7 am: da74454c03
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780474

Change-Id: Ie2798465753d7a6fd7d7e157fb528db6d17dbd89
2021-08-10 03:19:55 +00:00
Treehugger Robot
da74454c03 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." am: e9e1f5afa7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1780474

Change-Id: I848b4fa8b5ee660702ff1d630bab832d4da843d7
2021-08-10 03:07:39 +00:00
Treehugger Robot
e9e1f5afa7 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." 2021-08-10 02:54:06 +00:00
Treehugger Robot
0d7b83fdfc Merge changes Icabed06e,I25bc13c6 am: afce05e2e5 am: 9de9c7f693
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683328

Change-Id: I50a17e3b0a1d0da3794db7704585a7d1df3af14e
2021-08-10 02:45:37 +00:00
Lucas Lin
105b17be49 Merge "Make sure that only the owner can call [stop|start]VpnProfile()" into sc-dev am: 8d26ea92b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359750

Change-Id: Idc5d7e35ba220bdcd7dcfd6bcca43d987ef50260
2021-08-10 02:38:50 +00:00
Treehugger Robot
9de9c7f693 Merge changes Icabed06e,I25bc13c6 am: afce05e2e5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683328

Change-Id: Iccb3f39a62c0f8d34e986a12ca83e3c0b430b949
2021-08-10 02:31:28 +00:00
Lucas Lin
8d26ea92b4 Merge "Make sure that only the owner can call [stop|start]VpnProfile()" into sc-dev 2021-08-10 02:28:24 +00:00
Treehugger Robot
afce05e2e5 Merge changes Icabed06e,I25bc13c6
* changes:
  Bluetooth: Add Media Control Profile
  Bluetooth: Add GATT_INSUFFICIENT_AUTHORIZATION error code
2021-08-10 02:14:33 +00:00
Jayant Chowdhary
396aa0d202 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours am: 8d6dbba160 -s ours am: 138d803ee2 -s ours am: b8a3a61c6f -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I421c9e25f48d42d712bb93d34e42cd6835d5bfbd
2021-08-10 02:09:20 +00:00
Jayant Chowdhary
79a8a321cf [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours am: 8d6dbba160 -s ours am: a0143a6530 -s ours am: 77cb4f69ce -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I5565995ee480ccc9c2db20808824bb6c02f4df59
2021-08-10 02:09:07 +00:00
Curtis Belmonte
fb9d431132 Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev am: a69ceda9c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504270

Change-Id: I84a396731a3454729e1e0fdc35a9abd97403b758
2021-08-10 02:08:36 +00:00
Jayant Chowdhary
b8a3a61c6f [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours am: 8d6dbba160 -s ours am: 138d803ee2 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I4e4a3e9bed21cffc3650fab18c469f3d4f71cda5
2021-08-10 02:00:47 +00:00
Jayant Chowdhary
77cb4f69ce [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours am: 8d6dbba160 -s ours am: a0143a6530 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: Ic1da5e2041258323857faa214a00340ca3cafaeb
2021-08-10 01:59:50 +00:00
Curtis Belmonte
a69ceda9c4 Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev 2021-08-10 01:51:13 +00:00
Jayant Chowdhary
138d803ee2 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours am: 8d6dbba160 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I04d00bdfdc1339451e6eee7294ef03cd6be43c3a
2021-08-10 01:45:19 +00:00
Jayant Chowdhary
a0143a6530 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours am: 8d6dbba160 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: Id4c4ca051df2873d3c4525e7a965aec8626abe9a
2021-08-10 01:45:19 +00:00
Jayant Chowdhary
8d6dbba160 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours am: 0965418bf9 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I489bd4243d2e29ac2828869e52649704dd6ca504
2021-08-10 01:33:26 +00:00
Jayant Chowdhary
0965418bf9 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours am: d3894cef1b -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I02f81e3e2cdcdea15423fe4195a969e689eba0bd
2021-08-10 01:22:59 +00:00
Jayant Chowdhary
d3894cef1b [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1 am: 250fe56a43 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I8d25192a502857ac4d10bfdfe17cdacbbdfde64b
2021-08-10 01:06:13 +00:00
Jayant Chowdhary
250fe56a43 Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev am: b8ce7ca6a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15134188

Change-Id: I5b6f88fae24d84d5ca766e9dc3ef8863b7d35f9c
2021-08-10 00:41:08 +00:00
TreeHugger Robot
2bf443ada8 Merge "Consider swipes on the unlock icon as intent for device entry" into sc-dev am: 876e9771f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476347

Change-Id: I143d295d612dd462f435ec7972118fa38744b832
2021-08-10 00:37:31 +00:00
TreeHugger Robot
876e9771f7 Merge "Consider swipes on the unlock icon as intent for device entry" into sc-dev 2021-08-10 00:34:49 +00:00
Lucas Dupin
874c27f213 Merge "Consider shade expansion when blurring because QS" into sc-dev am: 65c4313694
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503404

Change-Id: Idf77fe9d0e2561b3a61f98f501ea55f02cb14fa0
2021-08-10 00:31:06 +00:00
Jayant Chowdhary
b8ce7ca6a1 Merge "camera2: Fix exception swallowing in params classes createFromParcel" into oc-mr1-dev 2021-08-10 00:28:42 +00:00
Lucas Dupin
65c4313694 Merge "Consider shade expansion when blurring because QS" into sc-dev 2021-08-10 00:21:02 +00:00
Curtis Belmonte
b1b868fabe Show fingerprint icon when face fails on BiometricPrompt
When BiometricPrompt is launched with both a face and fingerprint
enrolled, ensure that the fingerprint icon is shown immediately after
face authentication fails. This replaces the old behavior where an error
icon would be shown for ~2 seconds after face authentication failed.

Test: Manual:
1. Enroll both fingerprint and face on a device
2. Trigger BiometricPrompt (e.g. Internet > Settings > Share)
3. Ensure face authentication fails (e.g. by not looking at device)
4. Verify that the fingerprint icon is shown immediately

Fixes: 195794375
Change-Id: I5abf788df5e973711d932af685e674f03e89fae6
2021-08-09 16:48:47 -07:00
Leon Scroggins
e71b3f4311 Merge "Do not turn on dithering by default" into sc-dev am: 9817790471
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15502988

Change-Id: I5ac2844da8d52dfc4f944e74981a46286d61613b
2021-08-09 23:46:54 +00:00
Leon Scroggins
9817790471 Merge "Do not turn on dithering by default" into sc-dev 2021-08-09 23:34:12 +00:00
Dave Mankoff
d712f0e6d3 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5b3 -s ours am: 23ee1b87bb -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 25b172abfd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359209

Change-Id: I0a73172b5a3c1775acd152ef2907a5cbe9834c40
2021-08-09 21:37:44 +00:00
Dave Mankoff
23ee1b87bb [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev am: f58b0cd5b3 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 25b172abfd is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359209

Change-Id: Ia1f2af74315484676bb6602711e44e057496385d
2021-08-09 21:20:17 +00:00
Wei Wang
3cef2bf533 Merge "HintManagerService: only check isolated process for app uid" into sc-dev am: 12dd843d73
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15481666

Change-Id: Ie2edd74ac02ed6b633196ef00a6381752dbceed9
2021-08-09 21:12:24 +00:00
Dave Mankoff
f58b0cd5b3 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-qpr-dev 2021-08-09 21:08:39 +00:00
Wei Wang
12dd843d73 Merge "HintManagerService: only check isolated process for app uid" into sc-dev 2021-08-09 20:59:38 +00:00
Josh Tsuji
f2cd3f8588 Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev am: 5f51b92263
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15486170

Change-Id: I95b0133d537d89a6726a926a27c00862d78721a3
2021-08-09 19:41:17 +00:00
Lucas Dupin
73e1c53c80 Consider shade expansion when blurring because QS
Test: manually pull shade when locked, unlocked, from top and middle
Test: atest NotificationShadeDepthControllerTest
Fixes: 195285764
Bug: 195667456
Change-Id: I19e73a4a1b49c73534f3e20884da8a198ae83b6a
2021-08-09 19:31:07 +00:00
Josh Tsuji
5f51b92263 Merge "Don't call updateIsKeyguard from the UnlockedScreenOffAnimationController if we can't control the screen off animation." into sc-dev 2021-08-09 19:30:03 +00:00
Leon Scroggins III
eb5a3553dc Do not turn on dithering by default
Bug: 195281495
Test: Ief7025c21f365ae90fa63120f1cc82e0695901af

This is a partial revert of 47c51fe80e3dd9d6b518c11c2e1714c271835af5/
I5d5d03e430af380e23016c6deba5eca46067a22b. The intent was to bring
today's rendering implementation in line with the old HWUI
implementation, which always dithered gradients by default. However,
when dithering is enabled, the Skia implementation dithers more than
just gradients (e.g. Bitmaps). Combined with poor performance of the
dithering algorithm on certain GPUs, this led to a performance
regression on key apps.

Change-Id: Id54121091e2cc47131dc9b5ae67bd638fbc005fc
2021-08-09 15:11:20 -04:00
Jing Ji
de1ba7dfca Merge "Apply proper locks onto the service/association state tracking" into sc-dev am: 365cc28b50
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15475947

Change-Id: I0901375ae39ced3d3297d2fcae1783b8f84886af
2021-08-09 18:50:19 +00:00
Jing Ji
365cc28b50 Merge "Apply proper locks onto the service/association state tracking" into sc-dev 2021-08-09 18:33:20 +00:00
Jayant Chowdhary
8b405b2c5f [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours am: df1723afdf -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I60fd815936ac375a1725266422325282efcb24d1
2021-08-09 16:06:04 +00:00
Jayant Chowdhary
e5b26966c1 [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours am: 1a17ae5c9b -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I8a13d5856b2686c647a3708f83ee0c56d1dcdb08
2021-08-09 16:05:41 +00:00
Jayant Chowdhary
df1723afdf [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: b31822b392 -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 7bf30cb92a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: Ifa85e47deac6e2a75eb4dfa4a215635a4f5bd053
2021-08-09 15:58:01 +00:00
Jayant Chowdhary
1a17ae5c9b [automerger skipped] Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf am: 9e82fb98ed -s ours
am skip reason: Merged-In I745ca49daa6ca36b1020d518e9f346b52684f2b1 with SHA-1 6b0bcd60c8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I5ef627085baa0edd2aee1b19641104a0bedf108b
2021-08-09 15:56:46 +00:00
Jayant Chowdhary
b31822b392 Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I7b3fcde453bc537e5a98efcaa90637590c39c3e5
2021-08-09 15:45:23 +00:00
Jayant Chowdhary
9e82fb98ed Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791 am: 3c93e01ccf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727

Change-Id: I0dc4ada4e6e664d8517c710b8b905dffa825b2c0
2021-08-09 15:45:20 +00:00
Jakub Tyszkowski
723fe23ce8 Bluetooth: Add Media Control Profile
Tag: #feature
Bug: 150670922
Sponsor: jpawlowski@
Test: compilation
Change-Id: Icabed06e6b1973ecee9cd1d6eeec80c6d2a9d72e
2021-08-09 15:37:52 +00:00
Jakub Tyszkowski
c74aebb4db Bluetooth: Add GATT_INSUFFICIENT_AUTHORIZATION error code
Bug: 150670922
Sponsor: jpawlowski@
Tag: #feature
Test: compilation
Change-Id: I25bc13c658caba48cc37b0f1f253a77fd1336b29
2021-08-09 15:34:22 +00:00