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 sc-v2-dev am: d978682f24 am: 6322292206 am: 88d2f6c682

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

Change-Id: I8569feea86489bba556833f8251fb40170fae287
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-05-15 21:10:12 +00:00
committed by Automerger Merge Worker
parent e3e6bc108b 88d2f6c682
commit 7c180486e2
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

@@ -720,6 +720,13 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
} }
} }
} }
@Override
public void onStrongAuthStateChanged(int userId) {
if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
doKeyguardLocked(null);
}
}
}; };
ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() { ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1931,7 +1938,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
*/ */
private void doKeyguardLocked(Bundle options) { private void doKeyguardLocked(Bundle options) {
// 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;