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

Commit 88d2f6c6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "On device lockdown, always show the keyguard" into sc-v2-dev am: d978682f am: 63222922 

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



Change-Id: I4fea51b09e1b23ff31f5dcb1880a968bbf6ddee6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 449efaa9 63222922

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

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

            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

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

                doKeyguardLocked(null);

            }

        }

    };



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