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

Browse Source
This commit is contained in:
Treehugger Robot
2023-05-15 19:05:11 +00:00
committed by Android (Google) Code Review
parent 0b08770f21 100ae42365
commit d978682f24
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

@@ -677,6 +677,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
} }
} }
} }
@Override
public void onStrongAuthStateChanged(int userId) {
if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {
doKeyguardLocked(null);
}
}
}; };
ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() { ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1535,7 +1542,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;