summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-15Merge cherrypicks of ['googleplex-android-review.googlesource.com/26596788', ↵android-security-12.0.0_r59android12-security-releaseAndroid Build Coastguard Worker
'googleplex-android-review.googlesource.com/26596789'] into security-aosp-sc-release. Change-Id: I209a1d01c5a08e3f1dc9b063713fe5193272c01c
2024-03-15Revert "Refactor the SADeviceState to AdiDeviceState"Eric Laurent
Revert submission 25286114-anon_bt_address_sc_dev Reason for revert: b/329515274 Reverted changes: /q/submissionid:25286114-anon_bt_address_sc_dev (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e4beca4eb2d271e1a6fd53e702eb0417928b5c0) Merged-In: I808f111cbc0c493edde92906e7b7700b48b05c5f Change-Id: I808f111cbc0c493edde92906e7b7700b48b05c5f
2024-03-15Revert "AudioService: anonymize Bluetooth MAC addresses"Eric Laurent
Revert submission 25286114-anon_bt_address_sc_dev Reason for revert: b/329515274 Reverted changes: /q/submissionid:25286114-anon_bt_address_sc_dev (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9915df580bb82aab22529905fdfa29ebf075bf1f) Merged-In: Icd29d064dda03923637b362bb62eeaf2eeebcec2 Change-Id: Icd29d064dda03923637b362bb62eeaf2eeebcec2
2024-03-07Merge cherrypicks of ['googleplex-android-review.googlesource.com/25102282'] ↵Android Build Coastguard Worker
into security-aosp-sc-release. Change-Id: I9f82cc2edeceeb57af2fb2b8e597cba2e7cb83e0
2024-03-07Prioritize system toastsValentin Iftime
Insert toasts from system packages at the front of the queue to ensure that apps can't spam with toast to delay system toasts from showing. Also increase Clipboard paste warning toasts length to LENGTH_LONG. Test: atest NotificationManagerServiceTest Bug: 293301736 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:67721fcfb3198f220c90c976f870407a0bb8d6c6) Merged-In: I13547f853476bc88d12026c545aba9f857ce8724 Change-Id: I13547f853476bc88d12026c545aba9f857ce8724
2024-02-08Merge cherrypicks of ['googleplex-android-review.googlesource.com/25714995', ↵android-security-12.0.0_r58Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/25826644', 'googleplex-android-review.googlesource.com/25948484', 'googleplex-android-review.googlesource.com/26135753'] into security-aosp-sc-release. Change-Id: Ic52019fbd05b49d6a8293267b94649c45aa79738
2024-02-08Fix security vulnerability that creates user with no restrictions when ↵Tetiana Meronyk
accountOptions are too long. Bug: 293602970 Test: atest UserManagerTest#testAddUserAccountData_validStringValuesAreSaved_validBundleIsSaved && atest UserManagerTest#testAddUserAccountData_invalidStringValuesAreTruncated_invalidBundleIsDropped (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:944ea959ab8464c39a8f6a4fc391fb6953e1df89) Merged-In: I23c971f671546ac085060add89485cfac6691ca3 Change-Id: I23c971f671546ac085060add89485cfac6691ca3
2024-02-08isUserInLockDown can be true when there are other strong authBeverly
requirements Bug: 315206668 Bug: 218495634 Flag: None Test: manual, atest LockPatternUtilsTest (cherry picked from commit d341f1ecdb011d24b17358f115391b3f997cb179) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ce7ca2d9f405c94062504411c886eff93bd7ce15) Merged-In: I5e979a7822dd7254b4579ab28ecf96df1db44179 Change-Id: I5e979a7822dd7254b4579ab28ecf96df1db44179
2024-02-08Don't store invalid pkgs when migrating filtersJulia Reynolds
Test: NotificationManagerServiceTest Test: call method from test app, view policy xml file Flag: none Bug: 305926929 (cherry picked from commit bfa04e208995b05eee2a5336667f4e2dcd19fd30) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c6f48b5214fe8442f7669b9b5d89bc2d6d9d433e) Merged-In: Ib7fcb733edd2cf2cbac0a7699763a5fe993b467e Change-Id: Ib7fcb733edd2cf2cbac0a7699763a5fe993b467e
2024-02-08RESTRICT AUTOMERGE Added limitations for attributions to handle invalid casesKiran Ramachandra
Bug: 304983146 Test: Modified and introduced new tests to verify change -> atest CtsAppOpsTestCases:AttributionTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d9dc82face08025e6ccacb0ac6f7266fce5d2ea6) Merged-In: Ib9cd2864cc948238465ea59dbda4db0d9a75df29 Change-Id: Ib9cd2864cc948238465ea59dbda4db0d9a75df29
2024-01-11Merge cherrypicks of ['googleplex-android-review.googlesource.com/24112147', ↵android-security-12.0.0_r57Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/25676760', 'googleplex-android-review.googlesource.com/25716266', 'googleplex-android-review.googlesource.com/25787790'] into security-aosp-sc-release. Change-Id: I34096ba52b5aeb90891f679284811ea67ff17846
2024-01-11Close AccountManagerService.session after timeout.Dmitry Dementyev
Bug: 303905130 Bug: 316893159 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bb53f192e0ceaa026a083da156ef0cb0140f0c09) Merged-In: Ib4cebf1750fc6324dc1c8853e0d716ea5e8ec073 Change-Id: Ib4cebf1750fc6324dc1c8853e0d716ea5e8ec073
2024-01-11Disallow system apps to be installed/updated as instant.Alex Buynytskyy
Bug: 299441833 Test: atest android.content.pm.cts.PackageManagerTest (cherry picked from commit 496e78a1951f2ed69290f03c5625c0f8382f4d31) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0d0f185c0d526c1dac0a8894b2c2f2e378328d73) Merged-In: Idd89a6dd72f0e68259095f677185f0494391025c Change-Id: Idd89a6dd72f0e68259095f677185f0494391025c
2024-01-11Validate package names passed to the installer.Alex Buynytskyy
Bug: 308989388 Bug: 307532206 Test: atest android.content.pm.cts.PackageManagerTest (cherry picked from commit 1f445474cd1b902b2e7292a0d24e58f020fd51e7) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a7e48c8d7e00962d335b0076266a5df98d41a21c) Merged-In: I840c9c9af5752b3901d4719a13e7908faa43ab04 Change-Id: I840c9c9af5752b3901d4719a13e7908faa43ab04
2024-01-11Resolve custom printer icon boundary exploit.kumarashishg
Because Settings grants the INTERACT_ACROSS_USERS_FULL permission, an exploit is possible where the third party print plugin service can pass other's User Icon URI. This CL provides a lightweight solution for parsing the image URI to detect profile exploitation. Bug: 281525042 Test: Build and flash the code. Try to reproduce the issue with mentioned steps in the bug (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e0693ca9cb408d0dc82f6c6b3feb453fc8ddd83) Merged-In: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce Change-Id: Iaaa6fe2a627a265c4d1d7b843a033a132e1fe2ce
2023-12-06Merge cherrypicks of ['googleplex-android-review.googlesource.com/24081613', ↵android-security-12.0.0_r56Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/25101932', 'googleplex-android-review.googlesource.com/25064728', 'googleplex-android-review.googlesource.com/23183708', 'googleplex-android-review.googlesource.com/24696686', 'googleplex-android-review.googlesource.com/25387217', 'googleplex-android-review.googlesource.com/25286113', 'googleplex-android-review.googlesource.com/25286114'] into security-aosp-sc-release. Change-Id: If74ba75cabd36b11f5aa9b5623655ef08be7bbb8
2023-12-06AudioService: anonymize Bluetooth MAC addressesEric Laurent
Make sure APIs returning AudioDeviceAttributes from AudioService anonymize the Bluetooth MAC addresses because those are considered privacy sensitive. Only expose the full MAC address to system and apps with BLUETOOTH_CONNECT permission. setters, getters and listeners for preferred device for strategy, preferred device for capture preset and mute await connection are modified: - when entering AudioService, full MAC addresses are retrieved based on the known Bluetooth devices stored in AudioDeviceInventory.mDeviceInventory - when exiting AudioService, MAC addresses are anonymized if the client app does not have BLUETOOTH_CONNECT permission or is not a system component APIs based on AudioDeviceInfo do not need to be modified as the AudioDeviceInfo MAC address is for the AudioPort cached in the app process and AudioPorts are anonymized by the native audioserver before being returned to client apps. Bug: 285588444 Test: atest AudioManagerTest Test: atest RoutingTest Test: atest AudioCommunicationDeviceTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:05abf2ce0a76c4a0d7a14bc7c30435c2ac250f9e) Merged-In: I67bbba2ba941c97138a068d640079b17650e3d86 Change-Id: I67bbba2ba941c97138a068d640079b17650e3d86
2023-12-06Refactor the SADeviceState to AdiDeviceStateVlad Popa
The idea is to have a device state catalog for all the known devices. Also refactored the name of the Settings.Secure key entry for persistence. The current code will check the legacy key first, erase it and update the new key. Test: atest SpatializerHelperTest & AudioDeviceBrokerTest Bug: 278265907 Bug: 285588444 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:718d89772105c8153b3850b149691fbe540b692d) Merged-In: Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3 Change-Id: Idabcc84cb0f5f6f88ba5aebc435511ab95016ef3
2023-12-06Enforce persisted snoozed notifications limitsValentin Iftime
Prevent DoS attack that causes boot-looping by serializing a huge amount of snoozed notifications: - Check snooze limits for persisted notifications - Remove persisted group summary notification when in-memory counterpart is removed - Prevent unpriviledged API calls that allow 3P apps to snooze notifications with context/criterion Test: atest SnoozeHelperTest Test: atest NotificationManagerServiceTest Bug: 307948424 Bug: 308414141 (cherry picked from commit 965ff2d3c5487f72a77f6153ed8542cb2621d93c) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ade22bfdf6698cb97b4edc303e8952d6cc1a2f73) Merged-In: I3571fa9207b778def652130d3ca840183a9a8414 Change-Id: I3571fa9207b778def652130d3ca840183a9a8414
2023-12-06[RESTRICT AUTOMERGE] Check permission of Autofill icon URIsTim Yu
* SaveUI's template * Inline Suggestions slices Fixes: b/286235483 Fixes: b/292104015 Test: atest CtsAutoFillServiceTestCases (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:36875556fca3a0e9715d1cbd6cebff8e5720b2a0) Merged-In: I48879174664b70ced90492bb0991dc91cbf89b79 Change-Id: I48879174664b70ced90492bb0991dc91cbf89b79
2023-12-06Restrict activity launch when caller is running in the backgroundChristophe Pinelli
Test: test on device + atest-src BackgroundActivityLaunchTest#testBackgroundActivityBlockedInStartNextMatchingActivity Bug: 230492947 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:d54a64bdf71d1c91542b6885149fd176622ad0b4) Merged-In: I1a0c13e74622d301866efaca1b5351a6b241ebe5 Change-Id: I1a0c13e74622d301866efaca1b5351a6b241ebe5
2023-12-06Unbind TileService onNullBindingFabián Kozynski
Test: atest TileLifecycleManagerTest Test: manual: adb shell dumpsys activity service Test: sts test Bug: 300903792 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7bf830ca0df71496cd47563e138b8712918e0476) Merged-In: Ia8126ac65432b124683960e3ebf47301ba6172a1 Change-Id: Ia8126ac65432b124683960e3ebf47301ba6172a1
2023-12-06DO NOT MERGE: "Hide" /Android/data|obb|sanbox/ on shared storageSergey Nikolaienkov
Implement shouldHideDocument() in the ExternalStorageProvider so that it resitcts access to 'Android/data/', 'Android/obb/' and 'Android/sandbox' on the integrated shared storage along with all their content and subdirectories. Clean up the abstract FileSystemProvider, specifically all variants of queryChildDocuments(). Bug: 200034476 Bug: 220066255 Bug: 283962634 Test: make & flash systemimage, run manually Test: atest ExternalStorageProviderTests (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9a9602a68d6d7acb8e9bd6fa37ca93f11d6dd213) Merged-In: I48c2ce7ff2d7fc067961ea2af0ea63818316f086 Change-Id: I48c2ce7ff2d7fc067961ea2af0ea63818316f086
2023-12-06DO NOT MERGE Disallow Wallpaper service to launch activity from background.Nan Wu
Add a flag so that when a foreground client binds to a service, disallow the bound service to launch activity from background. Modify the WallpaperManagerService to take advantage of the new flag. Test: atest BackgroundActivityLaunchTest WallpaperManagerServiceTests Bug: 261072174 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:064be0ffc599a94ee2c4016cf69f4e8e0f062227) Merged-In: Id4e4cb6144597cf3638f2aaa34ea455a239fa1a7 Change-Id: Id4e4cb6144597cf3638f2aaa34ea455a239fa1a7
2023-11-10Merge cherrypicks of ['googleplex-android-review.googlesource.com/22621774', ↵android-security-12.0.0_r55Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/24413226', 'googleplex-android-review.googlesource.com/24993589', 'googleplex-android-review.googlesource.com/24867202', 'googleplex-android-review.googlesource.com/24665127', 'googleplex-android-review.googlesource.com/25175743', 'googleplex-android-review.googlesource.com/25238611', 'googleplex-android-review.googlesource.com/25119905', 'googleplex-android-review.googlesource.com/25208516'] into security-aosp-sc-release. Change-Id: Ifa325f9272a44b76f8a9cabd92836309e49e9176
2023-11-10Add null check for media metadataBeth Thibodeau
This check was inadvertently removed in a previous cherry pick and is still necessary. Bug: 307983823 Test: build (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:abc33695709d44d3f23a310601070d496067950a) Merged-In: I35e89feaf89322babb89fe0a30430606ebdfcdfc Change-Id: I35e89feaf89322babb89fe0a30430606ebdfcdfc
2023-11-10DO NOT MERGE: Fix ActivityManager#killBackgroundProcesses permissionsJing Ji
In the pevious CL, we incorrectly added the permission check in the killBackgroundProcessesExcept. Now fix this issue. Bug: 239423414 Bug: 223376078 Test: atest CtsAppTestCases:ActivityManagerTest (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:140fce861944419a375c669010c6c47cd7ff5b37) Merged-In: I9471a77188ee63ec32cd0c81569193e4ccad885b Change-Id: I9471a77188ee63ec32cd0c81569193e4ccad885b
2023-11-10Fix vulnerability that allowed attackers to start arbitary activitiesWill Leshner
Test: Flashed device and verified dream settings works as expected Test: Installed APK from bug and verified the dream didn't allow launching the inappropriate settings activity. Fixes: 300090204 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6926fd15fb16c51468dde270bd61ee68772b8c14) Merged-In: I573040df84bf98a493b39f96c8581e4303206bac Change-Id: I573040df84bf98a493b39f96c8581e4303206bac
2023-11-10RESTRICT AUTOMERGENan Wu
Log to detect usage of whitelistToken when sending non-PI target Log ActivityManagerService.sendIntentSender if the target is not a PendingIntent and a non-null whitelistToken is sent to the client. This is simply to detect if there are real cases this would happen before we decide simply remove whitelistToken in that case. Do not pass whitelistToken when sending non-PI target In ActivityManagerService.sendIntentSender, if the target is not a PendingIntent, do not send whitelistToken to the client. Bug: 279428283 Test: Manual test (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7a76717b61d8cb90a4987454f34e88417d68608b) Merged-In: I017486354a1ab2f14d0472c355583d53c27c4810 Change-Id: I017486354a1ab2f14d0472c355583d53c27c4810
2023-11-10[SB][Privacy] Fetch current active appops on startup.Caitlin Shkuratov
This also updates SysUI's chip animation scheduler to ignore an `isTooEarly` check if the chip animation is forced to be visible (which is true for privacy events). Bug: 294104969 Test: start recording, then kill systemui via adb-> verify privacy chip reappears after restart. Pull down shade and verify chip is correctly attributed. Stop recording and verify chip/dot disappears. Test: open camera, then kill systemui via adb -> verify privacy chip reappears after restart. Pull down shade and verify chip is correctly attributed. Close camera and verify chip/dot disappears. Test: smoke test of privacy chip and dot Test: atest AppOpsControllerTest SystemStatusAnimationSchedulerImplTest (cherry picked from commit 084a7afb4bb41e0cdfdbe67bdd60728d940b4331) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dac02d61f8cf755f733ef6c2fbd0f939ea13ee23) Merged-In: I664bb3003a2f6871113406e3257b7118bbdf2ab5 Change-Id: I664bb3003a2f6871113406e3257b7118bbdf2ab5
2023-11-10[CDM] Validate component name length before requesting notification access.Raphael Kim
Bug: 295335110 Test: Test app with long component name (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:edb1e78ee3a38f947b9518be90dbc12c223d1380) Merged-In: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579 Change-Id: I7ea5d5c1f78858db9865f3310d1e0aff9c8b5579
2023-11-10Truncate user data to a limit of 500 charactersTetiana Meronyk
Fix vulnerability that allows creating users with no restrictions. This is done by creating an intent to create a user and putting extras that are too long to be serialized. It causes IOException and the restrictions are not written in the file. By truncating the string values when writing them to the file, we ensure that the exception does not happen and it can be recorded correctly. Bug: 293602317 Test: install app provided in the bug, open app and click add. Check logcat to see there is no more IOException. Reboot the device by either opening User details page or running adb shell dumpsys user | grep -A12 heen and see that the restrictions are in place. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:46caac641941f2e8865a8d53400f959b3bd98d88) Merged-In: Ia71477601d036a3ca55e73cdc9698ae268a30f20 Change-Id: Ia71477601d036a3ca55e73cdc9698ae268a30f20
2023-11-10DO NOT MERGE Ensure finish lockscreen when usersetup incompleteAaron Liu
Ensure that when the usersetup for the user is not complete, we do not want to go to lockscreen, even if lockscreen is not disabled. Bug: 222446076 Test: add Unit test, Test: Wipe device, auth sim pin in setup, observe that lockscreen is not there. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:da4c8f81d9bc31ce856069bfe911dc6693b97e98) Merged-In: I8e33db8eb6e2c917966cab3d6a4f982670473040 Change-Id: I8e33db8eb6e2c917966cab3d6a4f982670473040
2023-11-10Dismiss keyguard when simpin auth'd and...Aaron Liu
security method is none. This is mostly to fix the case where we auth sim pin in the set up wizard and it goes straight to keyguard instead of the setup wizard activity. This works with the prevent bypass keyguard flag because the device should be noe secure in this case. Fixes: 222446076 Test: turn locked sim on, which opens the sim pin screen. Auth the screen and observe that keyguard is not shown. (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:48fa9bef3451e4a358c941af5b230f99881c5cb6) Cherry-picking this CL as a security fix Bug: 222446076 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:65ea56f54c059584eb27ec53d486dba8161316ab) Merged-In: Id302c41f63028bc6dd58ba686e23d73565de9675 Change-Id: Id302c41f63028bc6dd58ba686e23d73565de9675
2023-10-11Merge cherrypicks of ['googleplex-android-review.googlesource.com/23905843', ↵android-security-12.0.0_r54Android Build Coastguard Worker
'googleplex-android-review.googlesource.com/23918399', 'googleplex-android-review.googlesource.com/24420396', 'googleplex-android-review.googlesource.com/20064766', 'googleplex-android-review.googlesource.com/24046929', 'googleplex-android-review.googlesource.com/24573550', 'googleplex-android-review.googlesource.com/24339446', 'googleplex-android-review.googlesource.com/23623415', 'googleplex-android-review.googlesource.com/24605805', 'googleplex-android-review.googlesource.com/24182288', 'googleplex-android-review.googlesource.com/24761005', 'googleplex-android-review.googlesource.com/24058898', 'googleplex-android-review.googlesource.com/24805807', 'googleplex-android-review.googlesource.com/22465294', 'googleplex-android-review.googlesource.com/24642267'] into security-aosp-sc-release. Change-Id: I1abcb72496bdcacd22c899b01fd459eb006e7d30
2023-10-11RESTRICT AUTOMERGE: Check URI permissions for resumable media artworkBeth Thibodeau
When resumable media is added that has artwork set via URI, check the permissions for the URI before attempting to load it Test: atest MediaDataManagerTest UriGrantsManagerServiceTest Test: manual with test app Bug: 284297452 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ffae193f19f902d4ae890be579cd44573feeaedc) Merged-In: Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3 Change-Id: Ie79915d3d1712f08dc2e8dfbd5bc7fd32bb308a3
2023-10-11Move startWatchingModeWithFlags to the native supported binder callsEvan Severson
Bug: 247768581 Test: Add logging to verify invocation (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b1f82ee37403e40513ef3b9e2657feb3871c4e71) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fc85ac068d58f5cc690d5d587a46f6f691b0ce3a) Merged-In: I54eefca5f0aa4f924debc1817b04a103b6e8e2e6 Change-Id: I54eefca5f0aa4f924debc1817b04a103b6e8e2e6
2023-10-11Updated: always show the keyguard on device lockdownBeverly Tai
Additionally, don't hide keyguard when it's disabled if the user has locked down the device. Manual test steps: 1. Enable app pinning and disable "Ask for PIN before unpinning" setting 2. Pin an app (ie: Settings) 3. Lockdown from the power menu 4. Observe: user is brought to the keyguard, primary auth is required to enter the device. => After entering correct credential, the device is still in app pinning mode. => After entering an incorrect credential, the keyguard remains showing and the user can attempt again up to the limit Bug: 300463732 Bug: 218495634 Test: atest KeyguardViewMediatorTest Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:35a6e2f2c952440b1102033b2c3e496438503cff) Merged-In: I70fdae80f717712b3dfc9df54b9649959b4bb8f0 Change-Id: I70fdae80f717712b3dfc9df54b9649959b4bb8f0
2023-10-11Adding in verification of calling UID in onShellCommandKunal Malhotra
Test: manual testing on device Bug: b/261709193 (cherry picked from commit b651d295b44eb82d664861b77f33dbde1bce9453) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3ef3f18ba3094c4cc4f954ba23d1da421f9ca8b0) Merged-In: I68903ebd6d3d85f4bc820b745e3233a448b62273 Change-Id: I68903ebd6d3d85f4bc820b745e3233a448b62273
2023-10-11Revert "On device lockdown, always show the keyguard"Beverly Tai
This reverts commit b23c2d5fb6630ea0da503b937f62880594b13e94. Reason for revert: b/300463732 regression Bug: 300463732 Bug: 218495634 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f57217125f2b124c16c463ef4507fb054cc1ba4f) Merged-In: I31485d0d8caa3060e998636b071dbe03f6b4fc82 Change-Id: I31485d0d8caa3060e998636b071dbe03f6b4fc82
2023-10-11Validate userId when publishing shortcutsPinyao Ting
Bug: 288110451 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:01bfd04ff445db6290ae430d44ea1bf1a115fe3c) Merged-In: Idbde676f871db83825155730e3714f3727e25762 Change-Id: Idbde676f871db83825155730e3714f3727e25762
2023-10-11Use readUniqueFileDescriptor in incidentd servicePawan Wagh
readFileDescriptor doesn't provide ownership of the fds. fdopen needs ownership of the fds. Fds read from parcel should be duped in this scenario and readUniqueFileDescriptor dups fds internally. Test: m incidentd_service_fuzzer && adb sync data && adb shell /data/fuzz/x86_64/incidentd_service_fuzzer/incidentd_service_fuzzer Test: atest incidentd_test Bug: 286931110 Bug: 283699145 (cherry picked from commit ba78ef276951269f7b024baebdf1b8fa40bedb23) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:598dc664d4844363be12e0d164e1e522f92fa23f) Merged-In: Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e Change-Id: Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e
2023-10-11Restrict number of shortcuts can be added through addDynamicShortcutsPinyao Ting
This CL fixes the issue where, when an app have multiple main activities, the total number of shortcuts can grow indefinitely if they were published through addDynamicShortcuts. Bug: 281061287 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3215e73e36aa0463429226b5743ce24badf31227) Merged-In: Ib3eecefee34517b670c59dd5b8526fe9eb24f463 Change-Id: Ib3eecefee34517b670c59dd5b8526fe9eb24f463
2023-10-11Require permission to unlock keyguardMarzia Favaro
Bug: 288896339 Test: Manual, verify that the app which can be found on the bug can no longer call keyguardGoingAway successfully Require permission to unlock keyguard Bug: 288896339 Test: Manual, verify that the app which can be found on the bug can no longer call keyguardGoingAway successfully (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bd2aa5d309c5bf8e73161975bd5aba7945b25e84) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:be6ececad17f268b20cc252b29cbf3e848aef8ae) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7f28e3eaaf7c91c6b22ef89a9f18bfe081ba5b1e) Merged-In: I7ba7e56f954c8e6f1f734311f735215918975bc6 Change-Id: I7ba7e56f954c8e6f1f734311f735215918975bc6
2023-10-11Disable priority conversation widget for secondary usersJulia Reynolds
Test: NotificationConversationInfoTest.java Test: make a conversation priority on the primary user Test: make a conversation priority on a secondary user Bug: 288896269 (cherry picked from commit adf620316dcfaf19d7d4a73e2c63322b4a3a4d3a) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b0522df0a33d0165656797df7edab978cb403bd4) Merged-In: I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 Change-Id: I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31
2023-10-11Validate URI-based shortcut icon at creation time.Pinyao Ting
Bug: 288113797 Test: manual (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d41fb7620ffb9c81b23977c8367c323e4721e65) Merged-In: I392f8e923923bf40827a2b6207c4eaa262694fbc Change-Id: I392f8e923923bf40827a2b6207c4eaa262694fbc
2023-10-11RESTRICT AUTOMERGE: Drop invalid data.Kweku Adams
Drop invalid data when writing or reading from XML. PersistableBundle does lazy unparcelling, so checking the values during unparcelling would remove the benefit of the lazy unparcelling. Checking the validity when writing to or reading from XML seems like the best alternative. Bug: 246542285 Bug: 247513680 Test: install test app with invalid job config, start app to schedule job, then check logcat and jobscheduler persisted file (cherry picked from commit 666e8ac60a31e2cc52b335b41004263f28a8db06) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0e0819c9d6a957e56764c89e68542bb51bdb7db4) Merged-In: Ie817aa0993e9046cb313a750d2323cadc8c1ef15 Change-Id: Ie817aa0993e9046cb313a750d2323cadc8c1ef15
2023-10-11Visit Uris related to Notification style extrasMatías Hernández
Even if the corresponding styles themselves were not applied to the Notification.Builder. Test: atest NotificationManagerServiceTest Bug: 287640400 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:87db980ca1270083a2ba3c7317402a0cd289fd65) Merged-In: I25acab19be7dd486aabede8c91dbad5a1a217abf Change-Id: I25acab19be7dd486aabede8c91dbad5a1a217abf
2023-10-11Fix bypass BAL via `requestGeofence`Lifu Tang
Bug: 273729172 Test: manually (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7f9be7c3c859dc82d37452570d9878b58f6437a9) Merged-In: Ia8094244f908b20d42711b6ea8f58f9b3345b563 Change-Id: Ia8094244f908b20d42711b6ea8f58f9b3345b563
2023-10-11Visit Uris added by WearableExtenderMatías Hernández
Bug: 283962802 Test: atest + manual (POC app now crashes on notify() as expected) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:3d36966ea2aeebc3501a69a8ef7afce5ef593cee) Merged-In: I0da18c631eb5e4844a48760c7aaedab715a0bfed Change-Id: I0da18c631eb5e4844a48760c7aaedab715a0bfed