commit 996896e672f28aa96a3d8158192de3cd4a105bc3
author Beverly Tai <beverlyt@google.com> Thu Sep 14 20:51:27 2023 +0000
committer Beverly Tai <beverlyt@google.com> Fri Sep 22 18:44:56 2023 +0000
tree f59840f66098f80a0bf80368c63f45e16306b16e
parent 100ae42365d7fc8ba7d241e8c9a7ef6aa0cdb961

Revert "On device lockdown, always show the keyguard"

This reverts commit 100ae42365d7fc8ba7d241e8c9a7ef6aa0cdb961.

Reason for revert: b/300463732 regression
Bug: 300463732
Bug: 218495634

Change-Id: Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600
Merged-In: I314e5615b798487d9a965eaa0937905b65aa85fc

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 5f40e8c..b7916f9 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -677,13 +677,6 @@
                 }
             }
         }
-
-        @Override
-        public void onStrongAuthStateChanged(int userId) {
-            if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
-                doKeyguardLocked(null);
-            }
-        }
     };
 
     ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1542,8 +1535,7 @@
         }
 
         // 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;