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

Commit 63222922 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 

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



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

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

+9 −1
Original line number Original line 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() {

    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 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");

            if (DEBUG) Log.d(TAG, "doKeyguard: not showing because externally disabled");





            mNeedToReshowWhenReenabled = true;

            mNeedToReshowWhenReenabled = true;