diff options
| author | 2023-10-03 22:29:59 +0000 | |
|---|---|---|
| committer | 2023-10-03 22:29:59 +0000 | |
| commit | f5f429385c88789c77cff7a886605ffaa5f29d47 (patch) | |
| tree | a0eb933e412bb2dff5972f7142e7ffc6cb0db546 | |
| parent | 68def2a22603bb3fce19c228b5a339706bf7da52 (diff) | |
| parent | db65e4d5b8c3757f923e3f447d53875dfb84a8e7 (diff) | |
Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24790879
Change-Id: Iff361413a46599d2e9b64636954e20ee259f1a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 18474e0af5b8..cba717038871 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -1939,6 +1939,10 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, mExternallyEnabled = enabled; if (!enabled && mShowing) { + if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) { + Log.d(TAG, "keyguardEnabled(false) overridden by user lockdown"); + return; + } // hiding keyguard that is showing, remember to reshow later if (DEBUG) Log.d(TAG, "remembering to reshow, hiding keyguard, " + "disabling status bar expansion"); |