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

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

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

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



Change-Id: I7753a5e784502b873ef2a6e34b7a5db783d6b23e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fedf1c8c ba7a30e9

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;