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

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

Change-Id: I5e5de979876e358f90ba86479cf4a4b763b53633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Beverly Tai
2023-05-16 15:57:02 +00:00
committed by Automerger Merge Worker
parent 34ac6bbd24 efb376fe39
commit d0888dab48
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);
}
}
@Override
public void onStrongAuthStateChanged(int userId) {
if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
doKeyguardLocked(null);
}
}
};
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 (!mExternallyEnabled) {
if (!mExternallyEnabled
&& !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");
mNeedToReshowWhenReenabled = true;