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

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

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

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



Change-Id: I8569feea86489bba556833f8251fb40170fae287
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e3e6bc10 88d2f6c6

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

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

            }

        }



        @Override

        public void onStrongAuthStateChanged(int userId) {

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

                doKeyguardLocked(null);

            }

        }

    };



    ViewMediatorCallback mViewMediatorCallback = new ViewMediatorCallback() {
@@ -1931,7 +1938,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
     */

    private void doKeyguardLocked(Bundle options) {

        // 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;