Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
654,180 Commits 3 Branches 0 Tags
129bbf0b6865c19bde798db1cebca3cd9d604478
Commit Graph

654180 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lucas Lin
6e254477ef Merge "Make sure that only the owner can call [stop|start]VpnProfile()" into sc-dev am: 8d26ea92b4 am: da84c20ce6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15359750

Change-Id: Iff20279380a2bf33ee76f878c63606e07aa3b889
 2021-08-10 02:55:35 +00:00
Treehugger Robot
e9e1f5afa7 Merge "IAdbManager.getPairDevices returns FingerprintAndPairDevice[]." 2021-08-10 02:54:06 +00:00
Michael Groover
6c60c5c7c1 Create new instance of shared lineage signers to preserve capabilities 
When the platform writes package signatures to packages.xml the first
instance of a shared signature is written with the hex value of the
ANS.1 DER encoding and an index; subsequent instances of the same
signature just reference it via the index value. When writing a
previous signer in the lineage a flags attribute is also written
containing the capabilities of this previous signer in the lineage.
During boot the platform will read the packages and signatures from
the packages.xml, but when a shared signer is read the initial
instance of the signature is used for all packages that share this
same signer even if the signer is a previous signer with its own
capabilities. This causes the platform to lose the unique
capabilities granted to each signing lineage that use the same
signatures and can prevent apps from being able to join a
sharedUserId if another app with a lineage has revoked this
capability from its own signer. This commit creates a new signature
for each shared signature used as a previous signer in the
lineage to ensure these unique capabilities are maintained.

Bug: 195789348
Test: atest PkgInstallSignatureVerificationTest#
  testSharedKeyInSeparateLineageRetainsDeclaredCapabilities
Change-Id: I0f763a1b1b004c6e6e4f80d0e401ad5d4c4fab34
 2021-08-09 19:50:56 -07:00
Treehugger Robot
06996f5ca6 Merge changes Icabed06e,I25bc13c6 am: afce05e2e5 am: 9de9c7f693 am: 0d7b83fdfc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1683328

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

Change-Id: Iae6e1806b6972ac6c5968ab21984d5f5d95f9cfb
 2021-08-10 02:50:12 +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
da84c20ce6 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: I3b986f64f80ea0414d6e551b0381046039b0ecd9
 2021-08-10 02:40:30 +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
Jayant Chowdhary
8d48bbc99e [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: 8bc71c26b6 -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: Id3eb68aec66b86ffc2e77b8a3f4ae2f44b68dfba
 2021-08-10 02:31:57 +00:00
Jayant Chowdhary
1db823b7bd [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: ee79ce1764 -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: I9dbeb6cbd58885f75864bae15f1306a023ed4b22
 2021-08-10 02:31:47 +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
Curtis Belmonte
5d4d509fb1 Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev am: a69ceda9c4 am: 38d75fdf31 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504270

Change-Id: Ia48a38ce2ec64ef500ab1a8b170019d849ea5d6a
 2021-08-10 02:31:19 +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
2e81ee5339 [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: 396aa0d202 -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: Ied3805fed8389cff32cf193f498407fe99871f96
 2021-08-10 02:21:32 +00:00
Jayant Chowdhary
ec6cbc4659 [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: 79a8a321cf -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: I804ee9df4e480f0df6e0c718d9cc071e4de1d8c4
 2021-08-10 02:21:25 +00:00
Curtis Belmonte
a0bf2bcfbc Merge "Show fingerprint icon when face fails on BiometricPrompt" into sc-dev am: a69ceda9c4 am: fb9d431132 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504270

Change-Id: Id5c2ccd83df4871ba379ca1766637771ef241970
 2021-08-10 02:21:17 +00:00
Beth Thibodeau
c4e1c545e2 Reduce height of expanded media controls 
Total height is now 192 dp. Reduced album art size and some padding for
expanded media control layout. Also adjusted album art size and padding
for expanded recommendations card to fit

Bug: 189700268
Fixes: 194492458
Test: visual
Change-Id: I3ca096e663d10a05abee2a645dacfe4ce001597c
(cherry picked from commit 69377262a4)
 2021-08-10 02:18:51 +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
8bc71c26b6 [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: Iee25d770adf052c0d428a4a02e01501ceb77c2fb
 2021-08-10 02:10:00 +00:00
Jayant Chowdhary
ee79ce1764 [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: I3dd26505c2a042894922ebf8d77a04e8d887abab
 2021-08-10 02:09:56 +00:00
Curtis Belmonte
38d75fdf31 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: I9bc3faec17629a340e54aa2099a0eed423dc47ea
 2021-08-10 02:09:47 +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
Bill Yi
33f7214384 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If354b64f0817b60f66e4623699e7cf17d20df8fa
 2021-08-10 02:04:10 +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
Bill Yi
1f69d5875e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81876dd7997ec3f72890ebb1cce1d42a6fd1917f
 2021-08-10 01:50:03 +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
Joe Bolinger
316fbf7672 Add detailed fingerprint logging and a historical buffer. 
This was done for face as part of I5021534069d59158dde4488ebb13ef90d339ee39 and this extends the pattern for fingerprint to enable better debugging of the listening state changes.

Bug: 194817979
Test: manual (adb bugreport and verify recent auth attempts in logs)
Test: atest KeyguardListenQueueTest

Change-Id: Ib782c9e95c12a65496e2d0245f5f8169f478a6ca
 2021-08-09 18:31:56 -07: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
Bill Yi
57345aeb76 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I3aada634997993b5e5098be4d8cebfb14cb52293
 2021-08-10 01:22:11 +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
TreeHugger Robot
42b4824ec3 Merge "Consider swipes on the unlock icon as intent for device entry" into sc-dev am: 876e9771f7 am: a3759b40b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15476347

Change-Id: Ib7ee99bae2d833261de462aba7ff17e751fb34f2
 2021-08-10 00:59:58 +00:00
Lucas Dupin
9637429b89 Merge "Consider shade expansion when blurring because QS" into sc-dev am: 65c4313694 am: 5c05429e6e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503404

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

Change-Id: If886e831fba8fc7d63b3fd968d83041151284172
 2021-08-10 00:58:03 +00:00
Lucas Dupin
698029b34b Merge "Consider shade expansion when blurring because QS" into sc-dev am: 65c4313694 am: 874c27f213 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15503404

Change-Id: Icfe660e673a180561f8a19b104f16a71eccae1ce
 2021-08-10 00:57:58 +00:00
Bill Yi
fc0965fc7e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5629387b66935c7871511cd5ba54d2eb39cc3daa
 2021-08-10 00:47:15 +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
a3759b40b4 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: I81fe8aaa5dea43d47f764e4de5468af321200dd5
 2021-08-10 00:38:05 +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
5c05429e6e 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: I4a52b3d28b84e1719ee2e0b14be4794db5bd18fd
 2021-08-10 00:31:54 +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