Dave Mankoff
bc0c531069
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 am: f27380d2ed -s ours
...
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520
Change-Id: Ic422af33ef81f4f78bc893c56958da6c54e5cb61
2021-08-10 14:47:42 +00:00
Dave Mankoff
01429a24a1
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 -s ours am: 4d56213cf8 -s ours
...
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c2c2fa79ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520
Change-Id: Iac57bdab395d61798b1f9629cb9d510c1c3b96a0
2021-08-10 14:38:42 +00:00
Dave Mankoff
f27380d2ed
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520
Change-Id: Ibbe0f2081b3a3135932f5e464a7a470ac9495123
2021-08-10 14:23:37 +00:00
Dave Mankoff
4d56213cf8
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev am: af9ebd49b1 -s ours
...
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c2c2fa79ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358520
Change-Id: I3445750158f2527ed841c233ff3ae866f16c9790
2021-08-10 14:23:24 +00:00
Caitlin Cassidy
3d1c180320
Merge "[Ongoing Call] Always unregister the UidObserver." into sc-dev
2021-08-10 14:22:13 +00:00
Dave Mankoff
af9ebd49b1
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into rvc-dev
2021-08-10 14:10:32 +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
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
876e9771f7
Merge "Consider swipes on the unlock icon as intent for device entry" into sc-dev
2021-08-10 00:34:49 +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
9817790471
Merge "Do not turn on dithering by default" into sc-dev
2021-08-09 23:34:12 +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
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
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
365cc28b50
Merge "Apply proper locks onto the service/association state tracking" into sc-dev
2021-08-09 18:33:20 +00:00
Caitlin Cassidy
5329ad47a5
[Ongoing Call] Always unregister the UidObserver.
...
Test: atest OngoingCallControllerTest
Fixes: 194731244
Change-Id: I39d20313f78ec0c632dcde999abc0057141bac64
2021-08-09 17:22:15 +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
Jayant Chowdhary
3c93e01ccf
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a am: 0cf6fdb791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727
Change-Id: I1adb4fa9ae369c1eabbd3fcbdac7abf4425743bb
2021-08-09 15:30:32 +00:00
Jayant Chowdhary
0cf6fdb791
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev am: 93e157955a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15121727
Change-Id: Id144b968bf5154f806900e030d2b7bd9ba407c67
2021-08-09 15:20:58 +00:00
Jayant Chowdhary
93e157955a
Merge "camera2: Fix exception swallowing in params classes createFromParcel" into qt-dev
2021-08-09 15:12:22 +00:00
Derek Sollenberger
1171be085c
Merge "CanvasContext::draw: flushAndSubmit when not drawing" into sc-dev
2021-08-09 12:45:07 +00:00
Rhed Jao
97ff8e3eed
Merge "DO NOT MERGE Apply a maximum char count to the load label api" into sc-dev
2021-08-09 10:48:39 +00:00
Rhed Jao
49c8cdb84d
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: 1fabf50d78 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I98bc61f32ee8f75c63f86f35a36c074b88130078
2021-08-09 08:55:12 +00:00
Rhed Jao
3b3fa55d72
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: 357f63a381 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I9e520cc5c492397b0ab53ccdce52529e1eec3f87
2021-08-09 08:54:37 +00:00
Rhed Jao
3d011ccfd4
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours am: bd8b271f2a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: Ida1618f933672bf0a14c0f82011521ef323c0a14
2021-08-09 08:54:07 +00:00
Rhed Jao
92f4038734
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours am: b4b5f78073 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I470464e264e1768b591afa0dcfd6760f9994dbed
2021-08-09 08:53:41 +00:00
Rhed Jao
1fabf50d78
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I6ea80d94f67db60a422218c1ea3772e050819641
2021-08-09 08:42:28 +00:00
Rhed Jao
357f63a381
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I6089211f1e5e21a40c81d78bab4168b92153dc12
2021-08-09 08:42:22 +00:00
Rhed Jao
bd8b271f2a
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours am: be3551edad -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I51a276f103296068e75143f1e3b019dd0a51ef32
2021-08-09 08:42:21 +00:00
Rhed Jao
b4b5f78073
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours am: 576965b06d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: Ie7011056f45d8e79619c6d33d5cf42852867c929
2021-08-09 08:42:15 +00:00
Rhed Jao
be3551edad
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours am: 0f553a5f64 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I4b111020f744352b96f9efb282bdd382d6d70969
2021-08-09 08:29:03 +00:00
Rhed Jao
576965b06d
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours am: 96254f92a5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I5af44fd797016e20eaf936ccc9ce2b41ce8dc0a6
2021-08-09 08:28:38 +00:00
Rhed Jao
0f553a5f64
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: 7380c153b9 -s ours am: d5b3601177 -s ours am: 2159ba8c04 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433212
Change-Id: I1dd2d666977647ea2051483dec7b47730dbfdae1
2021-08-09 08:11:39 +00:00
Rhed Jao
96254f92a5
[automerger skipped] DO NOT MERGE Apply a maximum char count to the load label api am: b55d314f46 -s ours am: 8cd4647906 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15444548
Change-Id: I4a5ee088ae4b68c695d6c6a3f93034176d8f06eb
2021-08-09 08:11:10 +00:00