Merge tag 'android-security-13.0.0_r12' into staging/lineage-20.0_merge-android-security-13.0.0_r12
Android Security 13.0.0 Release 12 (10993242) # -----BEGIN PGP SIGNATURE----- # # iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCZW4YFAAKCRDorT+BmrEO # eKMmAJ4xzqaCt262gfWss+wGj8cRqIKfMQCeNfFLqjK3AnqeMohEK4n91oE5u24= # =lSwo # -----END PGP SIGNATURE----- # gpg: Signature made Mon Dec 4 20:19:00 2023 EET # gpg: using DSA key 4340D13570EF945E83810964E8AD3F819AB10E78 # gpg: Good signature from "The Android Open Source Project <initial-contribution@android.com>" [marginal] # gpg: initial-contribution@android.com: Verified 2092 signatures in the past # 2 years. Encrypted 4 messages in the past 23 months. # gpg: WARNING: This key is not certified with sufficiently trusted signatures! # gpg: It is not certain that the signature belongs to the owner. # Primary key fingerprint: 4340 D135 70EF 945E 8381 0964 E8AD 3F81 9AB1 0E78 # By Pinyao Ting (3) and others # Via Android Build Coastguard Worker * tag 'android-security-13.0.0_r12': Check URI permissions for resumable media artwork Stop using deprecated getParcelable method in AccountManagerService. Move startWatchingModeWithFlags to the native supported binder calls Updated: always show the keyguard on device lockdown Adding in verification of calling UID in onShellCommand Revert "On device lockdown, always show the keyguard" Validate userId when publishing shortcuts Use readUniqueFileDescriptor in incidentd service Restrict number of shortcuts can be added through addDynamicShortcuts Require permission to unlock keyguard Disable priority conversation widget for secondary users Validate URI-based shortcut icon at creation time. RESTRICT AUTOMERGE: Drop invalid data. Visit Uris related to Notification style extras Fix bypass BAL via `requestGeofence` Visit Uris added by WearableExtender Conflicts: packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java packages/SystemUI/src/com/android/systemui/media/controls/pipeline/MediaDataManager.kt packages/SystemUI/src/com/android/systemui/statusbar/notification/dagger/NotificationsModule.java packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationConversationInfo.java packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationGutsManager.java packages/SystemUI/tests/src/com/android/systemui/media/MediaDataManagerTest.kt packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/NotificationGutsManagerTest.java Change-Id: Ida8c817195a98650446ef2e4091f2481b861984b
Loading
Please register or sign in to comment