summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-02Merge cherrypicks of [18231932, 18439684, 18699572] into ↵android-12.1.0_r9android-12.1.0_r21android12-qpr3-s5-releaseandroid12-qpr3-s3-releaseAndroid Build Coastguard Worker
sparse-8599181-L64200000954895490. Change-Id: Idc08019a87950410cb7e9907ad0b2e686959f9e6
2022-06-02Revert "[DO NOT MERGE] Do not clear calling identify when using ↵Steve Berbary
BiometricPrompt from FingerprintService." This reverts commit 2d60fb3647a838c4c7f10c6f98bf98be4508b119. Reason for revert: CTS failure functional regression. More info can be found in this bug: b/214261879 Change-Id: I596ba36f6bd433cb9457c21b0bc2294baafc21b2 (cherry picked from commit 12d48b137afc9a678e597ccb3d9978db775a4f1b) Merged-In: I596ba36f6bd433cb9457c21b0bc2294baafc21b2
2022-06-02Revert "DO NOT MERGE Suppress notifications when device enter lockdown"Steve Berbary
This reverts commit 62845d9af7d9695d1019bd6d8b0ccb223ace52d3. Reason for revert: b/232714129 | [C10][BootStress][reboot]reset message: KP: sysrq triggered crash by init Change-Id: I54296e0973c8fb206acdfbf54cfa793b7cd3a902 (cherry picked from commit 04836fa17f1499d2de63f1a0dd0ad430bd5da920) Merged-In: I54296e0973c8fb206acdfbf54cfa793b7cd3a902
2022-06-02DO NOT MERGE: Revert "RESTRICT AUTOMERGE: Polish IME transition from ↵Ming-Shin Lu
fullscree..." Revert submission 17397265-presubmit-am-5310c6a98b9041fa8e3d0cd9070573d2 Reason for revert: b/231594180 and b/231548400 for SC QPR3 Reverted Changes: If2c6d7bd6:[automerge] RESTRICT AUTOMERGE: Polish IME transit... I332c0e4ff:RESTRICT AUTOMERGE: Polish IME transition from ful... Change-Id: I24750ada98c954244fa9ee8f844ec92aa0494c86 (cherry picked from commit 20e8b225a069c52b8d7ef0f4402b2f379fb46ffb) Merged-In: I24750ada98c954244fa9ee8f844ec92aa0494c86
2022-05-16Merge cherrypicks of [17416116, 17416117, 17416118, 17416119, 17452466, ↵Android Build Coastguard Worker
17630873, 17880725, 18030449, 18298311, 18321334] into sc-qpr3-release. Change-Id: Ief5832b73bbc91664969a62794aa2be1c8e6902a
2022-05-16Update ServiceState broadcast for location permissionsSarah Chin
Add extra checks for master location switch and location bypass packages and send broadcasts accordingly. Test: Verify location is sanitized using testapp Test: Verify privacy dashboard with MLS on/off Test: Verify location is sanitized/unsanitized with bypass list Bug: 230919427 Bug: 210118427 Change-Id: I9784527d6d79235830f562c1944562f5a6ac1fb3 Merged-In: I9784527d6d79235830f562c1944562f5a6ac1fb3 (cherry picked from commit ac5f03c07fafe1a9d5dba89737297da7c74214cf) Merged-In: I9784527d6d79235830f562c1944562f5a6ac1fb3
2022-05-16Add excludedPackages parameter to broadcastEvan Severson
This parameter is useful for when a broadcast's intent is not targeting specific package and it is not wanted to be delievered to a specific one. Test: Install two apps and create shell command argument to exlude packages, verify the correct packages can receive or get skipped. Verified with manifest and registered receivers. Bug: 231635380 Bug: 210118427 Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881 Change-Id: I9a331f71c7052b294d4eada0f0f658dba989d881 (cherry picked from commit c0ce69bc8d5225e38214dfdc2636b2cb5a375546) Merged-In: I9a331f71c7052b294d4eada0f0f658dba989d881
2022-05-16USB: Increase debounce time for DISCONNECT processing (revised)James Wei
Original patch: aosp/1539944 Bug: 207057578 Test: See details in b/209342433 Change-Id: I7ff58a1a9755939ccb26dad61969902ec91f2225 Signed-off-by: James Wei <jameswei@google.com> (cherry picked from commit 06626cef7a9bc8a437aeb912a09484b2b0c922dc) Merged-In: I7ff58a1a9755939ccb26dad61969902ec91f2225 (cherry picked from commit 615d5d653e036cbb6e09b0be35bdd6520aed9017) Merged-In: I7ff58a1a9755939ccb26dad61969902ec91f2225
2022-05-16Merge "DO NOT MERGE Suppress notifications when device enter lockdown" into ↵Android Build Coastguard Worker
snap-temp-L01900000954560285
2022-05-16DO NOT MERGE Suppress notifications when device enter lockdownWenhao Wang
This CL makes the following modifcations: 1. Add LockPatternUtils.StrongAuthTracker to monitor the lockdown mode status of the phone. 2. Call mListeners.notifyRemovedLocked with all the notifications in the mNotificationList when entering the lockdown mode. 3. Call mListeners.notifyPostedLocked with all the notifications in the mNotificationList when exiting the lockdown mode. 4. Dismiss the function calls of notifyPostedLocked, notifyRemovedLocked, and notifyRankingUpdateLocked during the lockdown mode. The CL also adds corresponding tests. Bug: 173721373 Test: atest NotificationManagerServiceTest Test: atest NotificationListenersTest Test: manually verify the paired device cannot receive notifications when the host phone is in lockdown mode. Ignore-AOSP-First: pending fix for a security issue. Change-Id: I7e83544863eeadf8272b6ff8a9bb8136d6466203 Merged-In: I7e83544863eeadf8272b6ff8a9bb8136d6466203 (cherry picked from commit 3cb6842a053e236cc98d7616ba4433c31ffda3ac) (cherry picked from commit 62845d9af7d9695d1019bd6d8b0ccb223ace52d3) Merged-In: I7e83544863eeadf8272b6ff8a9bb8136d6466203
2022-05-16[DO NOT MERGE] Do not clear calling identify when using BiometricPrompt from ↵Joe Bolinger
FingerprintService. Bug: 214261879 Test: atest AuthControllerTest Test: Manually verify with test apps in bug Change-Id: I8ae9f2b8a970bf7e5d32121dc358f7d0f0d060b8 (cherry picked from commit 2d60fb3647a838c4c7f10c6f98bf98be4508b119) Merged-In: I8ae9f2b8a970bf7e5d32121dc358f7d0f0d060b8
2022-05-16Log to EventLog on prepareUserStorage failureEric Biggers
Bug: 224585613 Change-Id: Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 Merged-In: Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 (cherry picked from commit 7d4ab9b698a83f131585f25662ac9211302a3400) Merged-In: Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5
2022-05-16Merge "Ignore errors preparing user storage for existing users" into ↵Android Build Coastguard Worker
snap-temp-L01900000954560285
2022-05-16Ignore errors preparing user storage for existing usersEric Biggers
Unfortunately we can't rule out the existence of devices where the user storage wasn't properly prepared, due to StorageManagerService previously ignoring errors from mVold.prepareUserStorage, combined with OEMs potentially creating files in per-user directories too early. And forcing these broken devices to be factory reset upon taking an OTA is not currently considered to be acceptable. One option is to only check for prepareUserStorage errors on devices that launched with T or later. However, this is a serious issue and it would be strongly preferable to do more than that. Therefore, this CL makes it so that errors are checked for all new users, rather than all new devices. A field ignorePrepareStorageErrors is added to the user record; it is only ever set to true implicitly, when reading a user record from disk that lacks this field. This field is used by StorageManagerService to decide whether to check for errors. Bug: 164488924 Bug: 224585613 Test: Intentionally made a device affected by this issue by reverting the CLs that introduced the error checks, and changing vold to inject an error into prepareUserStorage. Then, flashed a build with this CL without wiping userdata. The device still boots, as expected, and the log shows that the error was intentionally ignored. Tested that if a second user is added, the error is *not* ignored and the second user's storage is destroyed before it can be used. Finally, wiped the device and verified that it won't boot up anymore, as expected since error checking is enabled for the system user in that case. Change-Id: I9bdd1a4bf5b14542adb901f264a91d489115c89b (cherry picked from commit 60d8318c47b7b659716d71243d087b34ab327f64) Merged-In: I9bdd1a4bf5b14542adb901f264a91d489115c89b (cherry picked from commit e667b604021e543436aabece21dc78d19fe9948e) Merged-In: I9bdd1a4bf5b14542adb901f264a91d489115c89b
2022-05-16UserDataPreparer: reboot to recovery for system user onlyEric Biggers
With the next CL, old devices might contain a combination of old users with prepareUserStorage error checking disabled and new users with prepareUserStorage error checking enabled. Factory resetting the whole device when any user fails to prepare may be too aggressive. Also, UserDataPreparer already destroys the affected user's storage when it fails to prepare, which seems to be fairly effective at breaking things for that user (absent proper error handling by upper layers). Therefore, let's only factory reset the device if the failing user is the system user. Bug: 164488924 Bug: 224585613 Change-Id: Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97 (cherry picked from commit 4c76da76c9831266e4e63c0618150bed10a929a7) Merged-In: Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97 (cherry picked from commit fd31f740ce5e7beb342e0e21b983de1100782bdb) Merged-In: Ia1db01ab4ec6b3b17d725f391c3500d92aa00f97
2022-05-16Merge "UserDataPreparer: reboot to recovery if preparing user storage fails" ↵Android Build Coastguard Worker
into snap-temp-L01900000954560285
2022-05-16UserDataPreparer: reboot to recovery if preparing user storage failsEric Biggers
StorageManager.prepareUserStorage() can throw an exception if a directory cannot be encrypted, for example due to already being nonempty. In this case, usage of the directory must not be allowed to proceed. UserDataPreparer currently handles this by deleting the user's directories, but the error is still ultimately suppressed and starting the user is still allowed to proceed. The correct behavior in this case is to reboot into recovery to ask the user to factory reset the device. This is already what happens when 'init' fails to encrypt a directory with the system DE policy. However, this was overlooked for the user directories. Start doing this. Bug: 164488924 Bug: 224585613 Change-Id: Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54 (cherry picked from commit 5256365e65882b81509ec2f6b9dfe2dcf0025254) Merged-In: Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54 (cherry picked from commit e1f17026ca80e43952fcc5d3a246615b711eba0a) Merged-In: Ib5e91d2510b25780d7a161b91b5cee2f6f7a2e54
2022-05-16StorageManagerService: don't ignore failures to prepare user storageEric Biggers
We must never leave directories unencrypted. Bug: 164488924 Bug: 224585613 Change-Id: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 (cherry picked from commit 50946dd15fd14cbf92b5c7e32ac7a0f088b8b302) Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2 (cherry picked from commit 567e7a0476a3251d02705932268cd5f395ef863f) Merged-In: I9a38ab5cca1ae9c9ebff81fca04615fd83ebe4b2
2022-04-22Merge cherrypicks of [17800234] into sc-qpr3-release.Android Build Coastguard Worker
Change-Id: I4bae0639b4dc3948f50aa794f00285ffb1b5604b
2022-04-22[DO NOT MERGE] Force extra nav bar provide side gesture insetsYunfan Chen
This is a patch to fix the missing gesture insets issue when there's a task bar and no navigation bar on the display. It will try to add the gesture navigation insets when a window providing navigation bar insets is added and there's no window with TYPE_NAVIGATION_BAR. The logic will only be applied when the insets is not flexible. Due to the removal of the old hard-coded logic in the later version, this patch should not be merged into the next version. Bug: 212643340 Test: android.widget.cts.SeekBarTest#testSetOnSeekBarChangeListener Change-Id: I080df3547361aef1aa259dd2b3dc9bdb860a0193 (cherry picked from commit 1921f8c1dc660851a499c5dac5a55cedf854f93e) Merged-In: I080df3547361aef1aa259dd2b3dc9bdb860a0193
2022-04-09Snap for 8426946 from d4cb37a7d3eca5c380a97d64b835f40fbf0bf18f to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I2ddcaddc839492e7f87d11faa6d7186fd7923e8a
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-08Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-devTreeHugger Robot
2022-04-07Snap for 8417597 from d4e7e2336adf8d10cdd9ab321be7933af6f05c1c to ↵Android Build Coastguard Worker
sc-qpr3-release Change-Id: I68d53bab704de257ebec2041841fe478bcd0b26c
2022-04-07Merge "Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Automerger Merge Worker
49f031ea4d am: 2f74509789 am: c14e995495" into sc-v2-dev
2022-04-07Merge "Fix issue where cold-start launching an activity from the shade while ↵TreeHugger Robot
an occluding activity is visible would result in an inescapable black screen." into sc-v2-dev
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Remi NGUYEN VAN
49f031ea4d am: 2f74509789 am: c14e995495 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: Ifb8d0d20243e35601011eedb9442594f24067fe0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: ↵Remi NGUYEN VAN
49f031ea4d am: 2f74509789 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: Ie1230d9ce9e590b6174ce9d28cc0106d0058b64a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ff am: 49f031ea4dRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I22822a2d3c5eb82a05455175c4f901bd271aefab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requested am: 4f319df8ffRemi NGUYEN VAN
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17614780 Change-Id: I9447047994de63d7e1f0ea09caf41093126c4228 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "[DO NOT MERGE] Fixed status bar glitch for apps that access internal ↵Shawn Lin
res" into sc-v2-dev
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 am: 4636aea564 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Icd89bfbe997fd18e8b8bfcddd5c198ad34d8d8c6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 am: e518ef6409 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Ie04277d055fb481438470087819c529a7392903b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Disallow PAP authentication when MPPE is requestedRemi NGUYEN VAN
MPPE cannot work if PAP is used as authentication, so it is not useful to allow PAP authentication when MPPE is enforced: establishing the tunnel would fail anyway with "MPPE required, but MS-CHAP[v2] auth not performed". Also users enforcing MPPE may assume that this means PAP will not be used for authentication, so without this change MPPE enforcement gives a false sense of security, as PAP uses plain-text credentials. Bug: 201660636 Test: atest VpnTest Merged-In: Ie318d45fe44294e97cf38da7f1834cf014cb4417 Change-Id: Ie318d45fe44294e97cf38da7f1834cf014cb4417 (cherry picked from commit 997a4a39268b4f3af7ccc388269b5eb1972d3624)
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 am: 6b36ce6895 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: Ifc65d6af6a1623ab2c4d6d25629ebad376cb5728 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 am: 74f9b7f432 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I9264ab8f95bec38b438024cc7a65a6b6b720e6fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am: 58e958133f -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I21dbbd1657b46707bfc166aaf0e15cbbcccc9df6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am: 8b4fe475a8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: Id00e21bafa61a9174b85c68a461400a892d8c77d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 am: 8193edd104 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I73cf3414a8bd2067fa673fe198244c86eb2726c7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Merge "limit TelecomManager#registerPhoneAccount to 10; api doc update" into ↵Tyler Gunn
qt-dev am: 08f8988bc3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] Merge "[qt] RESTRICT AUTOMERGE Add ↵TreeHugger Robot
finalizeWorkProfileProvisioning." into qt-dev am: 9bc1facf00 am: 6b4842a815 -s ours am: 63783b32bc -s ours am: 7268d3d045 -s ours am: 607cc6acf4 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I554fe339239a0581021bda208444f846d844a381 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06[automerger skipped] [qt] RESTRICT AUTOMERGE Add ↵Jonathan Scott
finalizeWorkProfileProvisioning. am: c5037ec63c am: 9a83111755 -s ours am: 1aa3133d1b -s ours am: 693fe862b9 -s ours am: 4d47369e41 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17587088 Change-Id: I1fa066a66afc97a76304fef898b44a63dd5fb9d9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06Import translations. DO NOT MERGE ANYWHEREBill Yi
Auto-generated-cl: translation import Change-Id: Ie2f5ad43e3ac8487d54cd255b657da5627de44a8
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-29 01:23:44 +0000