mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-10 05:11:58 +00:00
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Beverly Tai <beverlyt@google.com>
|
||
|
|
Date: Thu, 14 Sep 2023 20:50:28 +0000
|
||
|
|
Subject: [PATCH] Revert "On device lockdown, always show the keyguard"
|
||
|
|
|
||
|
|
This reverts commit b23c2d5fb6630ea0da503b937f62880594b13e94.
|
||
|
|
|
||
|
|
Reason for revert: b/300463732 regression
|
||
|
|
Bug: 300463732
|
||
|
|
Bug: 218495634
|
||
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f57217125f2b124c16c463ef4507fb054cc1ba4f)
|
||
|
|
Merged-In: I31485d0d8caa3060e998636b071dbe03f6b4fc82
|
||
|
|
Change-Id: I31485d0d8caa3060e998636b071dbe03f6b4fc82
|
||
|
|
---
|
||
|
|
.../systemui/keyguard/KeyguardViewMediator.java | 10 +---------
|
||
|
|
1 file changed, 1 insertion(+), 9 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||
|
|
index 820c7eac715a..292e9e752052 100644
|
||
|
|
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||
|
|
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
|
||
|
|
@@ -586,13 +586,6 @@ public class KeyguardViewMediator extends SystemUI {
|
||
|
|
notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
-
|
||
|
|
- @Override
|
||
|
|
- public void onStrongAuthStateChanged(int userId) {
|
||
|
|
- if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
|
||
|
|
- doKeyguardLocked(null);
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
};
|
||
|
|
|
||
|
|
ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
|
||
|
|
@@ -1348,8 +1341,7 @@ public class KeyguardViewMediator extends SystemUI {
|
||
|
|
}
|
||
|
|
|
||
|
|
// if another app is disabling us, don't show
|
||
|
|
- if (!mExternallyEnabled
|
||
|
|
- && !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
|
||
|
|
+ if (!mExternallyEnabled) {
|
||
|
|
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
|
||
|
|
|
||
|
|
// note: we *should* set mNeedToReshowWhenReenabled=true here, but that makes
|