commit 23532ed546f2c1b2e794a627da67eef1ee374fae
author Beverly Tai <beverlyt@google.com> Tue May 16 16:39:46 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue May 16 16:39:46 2023 +0000
tree 3bc820e1084ad584f2f14ee9892df6e585b45389
parent d8c3a88318ea58eb0fad39d35f440370f2c7f864
parent d0888dab482510d1c2783a51e0762362bef338ba

Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a5377e am: efb376fe39 am: d0888dab48

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23089588

Change-Id: Ie99a5a47fb19aebff0966c684dccd17424b3ebdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 192908f..108d30b 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -678,6 +678,13 @@
                 notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper);
             }
         }
+
+        @Override
+        public void onStrongAuthStateChanged(int userId) {
+            if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
+                doKeyguardLocked(null);
+            }
+        }
     };
 
     ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1525,7 +1532,8 @@
         }
 
         // if another app is disabling us, don't show
-        if (!mExternallyEnabled) {
+        if (!mExternallyEnabled
+            && !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
             if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
 
             mNeedToReshowWhenReenabled = true;