mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-01 17:11:41 +00:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
34 lines
1.8 KiB
Diff
34 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Aaron Liu <aaronjli@google.com>
|
|
Date: Thu, 10 Aug 2023 15:37:24 +0000
|
|
Subject: [PATCH] Revert "DO NOT MERGE Dismiss keyguard when simpin auth'd
|
|
and..."
|
|
|
|
This reverts commit 09f004722284ef6b9790ddf9338a1708b3f0833c.
|
|
|
|
Reason for revert: causing a partner bug
|
|
Fixes: 295205456
|
|
Bug: 222446076
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8df038265475bb062ead9eec1749ee92a0f5eb4e)
|
|
Merged-In: Ida11d98117727f63547b096617a4778bea429e22
|
|
Change-Id: Ida11d98117727f63547b096617a4778bea429e22
|
|
|
|
Change-Id: Ie19925a66a392dd4a4120bbf33e454c38aa41d34
|
|
---
|
|
.../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 bb205956e932..6a71cf84759c 100644
|
|
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
|
|
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java
|
|
@@ -351,7 +351,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;
|
|
} else {
|