mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-14 18:34:30 -05:00
41 lines
2.2 KiB
Diff
41 lines
2.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aaron Liu <aaronjli@google.com>
|
||
|
|
Date: Tue, 28 Mar 2023 13:15:04 -0700
|
||
|
|
Subject: [PATCH] DO NOT MERGE Dismiss keyguard when simpin auth'd and...
|
||
|
|
|
||
|
|
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:09f004722284ef6b9790ddf9338a1708b3f0833c)
|
||
|
|
Merged-In: If4360dd6ae2e5f79b43eaf1a29687ac9cc4b6101
|
||
|
|
AOSP-Change-Id: If4360dd6ae2e5f79b43eaf1a29687ac9cc4b6101
|
||
|
|
Change-Id: Id6eb8eff88481f9ec2c9cbcde9d7b0f78a349d98
|
||
|
|
---
|
||
|
|
.../src/com/android/keyguard/KeyguardSecurityContainer.java | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
|
||
|
|
index 89514a52d0bd..bd555e7360d8 100644
|
||
|
|
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
|
||
|
|
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
|
||
|
|
@@ -529,7 +529,7 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
|
||
|
|
case SimPuk:
|
||
|
|
// Shortcut for SIM PIN/PUK to go to directly to user's security screen or home
|
||
|
|
SecurityMode securityMode = mSecurityModel.getSecurityMode(targetUserId);
|
||
|
|
- if (securityMode == SecurityMode.None && mLockPatternUtils.isLockScreenDisabled(
|
||
|
|
+ if (securityMode == SecurityMode.None || mLockPatternUtils.isLockScreenDisabled(
|
||
|
|
KeyguardUpdateMonitor.getCurrentUser())) {
|
||
|
|
finish = true;
|
||
|
|
eventSubtype = BOUNCER_DISMISS_SIM;
|