Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58db8727 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Updated: always show the keyguard on device lockdown" into udc-dev am:... 

Merge "Updated: always show the keyguard on device lockdown" into udc-dev am: db65e4d5 am: 581a3fe4

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



Change-Id: Ibec6d3c393578002e5880975f29eaa3296d9c395
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8fcefcb3 581a3fe4

packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java

+4 −0
Original line number Diff line number Diff line
@@ -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");