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

Commit 2510373e authored by Beverly Tai's avatar Beverly Tai Committed by Android Build Coastguard Worker
Browse files

Revert "On device lockdown, always show the keyguard" 

This reverts commit 100ae423.

Reason for revert: b/300463732 regression
Bug: 300463732
Bug: 218495634
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:996896e672f28aa96a3d8158192de3cd4a105bc3)
Merged-In: Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600
Change-Id: Ida8f2ab5e4ac79b38c21ba7bacfe9c374c9cc600
parent a5e55363

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

+1 −9
Original line number Diff line number Diff line
@@ -702,13 +702,6 @@ public class KeyguardViewMediator extends CoreStartable implements Dumpable, 
                }

            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

            if (mLockPatternUtils.isUserInLockdown(KeyguardUpdateMonitor.getCurrentUser())) {

                doKeyguardLocked(null);

            }

        }

    };



    ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1783,8 +1776,7 @@ public class KeyguardViewMediator extends CoreStartable 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;