Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Beverly Tai
2023-05-16 16:39:46 +00:00
committed by Automerger Merge Worker
parent d8c3a88318 d0888dab48
commit 23532ed546
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -678,6 +678,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper); notifyHasLockscreenWallpaperChanged(hasLockscreenWallpaper);
} }
} }
@Override
public void onStrongAuthStateChanged(int userId) {
if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
doKeyguardLocked(null);
}
}
}; };
ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() { ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1525,7 +1532,8 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
} }
// if another app is disabling us, don't show // 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"); if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
mNeedToReshowWhenReenabled = true; mNeedToReshowWhenReenabled = true;