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

Commit ba7a30e9 authored by Beverly Tai's avatar Beverly Tai Committed by Android (Google) Code Review
Browse files

Merge "Revert "On device lockdown, always show the keyguard"" into rvc-dev

parents 72aee140 f5721712

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

+1 −9
Original line number Diff line number Diff line
@@ -575,13 +575,6 @@ 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() {
@@ -1367,8 +1360,7 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable { 
        }



        // if another app is disabling us, don't show

        if (!mExternallyEnabled

            && !mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {

        if (!mExternallyEnabled) {

            if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");



            mNeedToReshowWhenReenabled = true;