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

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

Merge "On device lockdown, always show the keyguard" into rvc-dev am: cc94a537 am: efb376fe 

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



Change-Id: I5e5de979876e358f90ba86479cf4a4b763b53633
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34ac6bbd efb376fe

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

+9 −1
Original line number Diff line number Diff line
@@ -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;