From f57217125f2b124c16c463ef4507fb054cc1ba4f Mon Sep 17 00:00:00 2001 From: Beverly Tai Date: Thu, 14 Sep 2023 20:50:28 +0000 Subject: Revert "On device lockdown, always show the keyguard" This reverts commit b23c2d5fb6630ea0da503b937f62880594b13e94. Reason for revert: b/300463732 regression Bug: 300463732 Bug: 218495634 Change-Id: I31485d0d8caa3060e998636b071dbe03f6b4fc82 Merged-In: Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600 Merged-In: I314e5615b798487d9a965eaa0937905b65aa85fc Merged-In: I31485d0d8caa3060e998636b071dbe03f6b4fc82 --- .../com/android/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 4199f9c77b80..d8eda2c1ecc5 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -575,13 +575,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper); } } - - @Override - public void onStrongAuthStateChanged(int userId) { - if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) { - doKeyguardLocked(null); - } - } }; ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() { @@ -1367,8 +1360,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { } // 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"); mNeedToReshowWhenReenabled = true; -- cgit v1.2.3-59-g8ed1b