Merge tag 'android-security-10.0.0_r72' of...
Merge tag 'android-security-10.0.0_r72' of https://android.googlesource.com/platform/frameworks/base into staging/lineage-17.1_merge_android-security-10.0.0_r72 Android security 10.0.0 release 72 * tag 'android-security-10.0.0_r72' of https://android.googlesource.com/platform/frameworks/base: [DO NOT MERGE] Do not dismiss keyguard after SIM PUK unlock DO NOT MERGE Fix auto-grant of AR runtime permission if device is upgrading from pre-Q Fix system zen rules by using owner package name if caller is system [RESTRICT AUTOMERGE] Check permission for VoiceInteraction Trim any long string inputs that come in to AutomaticZenRule Check rule package name in ZenModeHelper.addAutomaticRule Do not send AccessibilityEvent if notification is for different user. [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo switch TelecomManager List getters to ParceledListSlice DO NOT MERGE Move accountname and typeName length check from Account.java to AccountManagerService. Conflicts: core/java/android/content/pm/PackageManagerInternal.java packages/SystemUI/src/com/android/keyguard/KeyguardPasswordView.java packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java packages/SystemUI/src/com/android/keyguard/KeyguardSimPinView.java packages/SystemUI/src/com/android/keyguard/KeyguardSimPukView.java services/core/java/com/android/server/pm/PackageManagerService.java services/core/java/com/android/server/pm/permission/PermissionManagerService.java Change-Id: I7a59659e46770cccd009bb37204ff6c7ce62c049
Loading
Please register or sign in to comment