mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-01-08 06:08:01 -05:00
af360bc9ea
wgetc873988898.patch -O telecomm-01.patch wget0fb5786dbf.patch -O mediaprovider-01.patch wget1a4b9ef510.patch -O wifi-01.patch wget364a1d9962.patch -O bluetooth-01.patch wget87a06448b9.patch -O settings-01.patch wgetaaba724a68.patch -O settings-02.patch wget507304e1f5.patch -O native-01.patch wget89489ff5dd.patch -O base-01.patch wgetd1765c4715.patch -O base-02.patch wgetcbb1a0ecd6.patch -O base-03.patch wget4725772c0b.patch -O base-04.patch wget19747f6923.patch -O base-05.patch wgete7a1aa9ed0.patch -O base-06.patch wget922a7860b1.patch -O base-07.patch wgeted183ed912.patch -O base-08.patch wgetc6fbe1330a.patch -O base-09.patch wget9141cac175.patch -O base-10.patch wget41235bcc67.patch -O av-01.patch wgeta89f704701.patch -O av-02.patch wget6d7cd80d77.patch -O av-03.patch wget75fc175a08.patch -O av-04.patch wgetb023ec300f.patch -O av-05.patch wgetc8117d1539.patch -O av-06.patch wgetf06d23d824.patch -O av-07.patch wget9c7408ab07.patch -O av-08.patch wgetcfbfcefb3c.patch -O launcher-01.patch wget4a27a7f162.patch -O libxml-01.patch Signed-off-by: Tad <tad@spotco.us>
33 lines
1.9 KiB
Diff
33 lines
1.9 KiB
Diff
From 9141cac175caaf176377d088e334d0991482fd6a Mon Sep 17 00:00:00 2001
|
|
From: Aaron Liu <aaronjli@google.com>
|
|
Date: Thu, 10 Aug 2023 15:38:08 +0000
|
|
Subject: [PATCH] Revert "Dismiss keyguard when simpin auth'd and..."
|
|
|
|
Revert submission 22621774-cherrypicker-L22000000959901080:N28400001357657640
|
|
|
|
Reason for revert: causing a partner bug
|
|
Fixes: 295205456
|
|
Bug: 222446076
|
|
|
|
Reverted changes: /q/submissionid:22621774-cherrypicker-L22000000959901080:N28400001357657640
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:0afa6707fa632c1f5fba5dff46a94b5d734e2ab2)
|
|
Merged-In: Icb27b4d897696b4fbb4e4a878751d925f5205dfd
|
|
Change-Id: Icb27b4d897696b4fbb4e4a878751d925f5205dfd
|
|
---
|
|
.../android/keyguard/KeyguardSecurityContainerController.java | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
|
|
index 16299c7aff7b..061bab8a7006 100644
|
|
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
|
|
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java
|
|
@@ -752,7 +752,7 @@ public boolean showNextSecurityScreenOrFinish(boolean authenticated, int targetU
|
|
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;
|