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

Commit af9de2e6 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:... 

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

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



Change-Id: If176fab43b161223f7e4a24e2a0060237b046ab8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4934f58c 4f8e0db4

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

+1 −9
Original line number Diff line number Diff line
@@ -678,13 +678,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() {
@@ -1532,8 +1525,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;