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

Commit 2d983f5e authored by Danny Baumann's avatar Danny Baumann Committed by Steve Kondik
Browse files

Don't let apps disable the SIM PIN entry screen. 

As the user (who controls the app behaviour after all) likely doesn't
see the PIN screen as a lock screen (he likely wants telephony) and the
PIN screen is not shown on a timer-driven basis, it should be treated
specially.

Change-Id: I8d48ab5f097bc926f67eab5835d9b5f1e581db15
parent b6a1eb3b

packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java

+16 −16
Original line number Diff line number Diff line
@@ -925,22 +925,6 @@ public class KeyguardViewMediator { 
     * Enable the keyguard if the settings are appropriate.

     */

    private void doKeyguardLocked(Bundle options) {

        // if another app is disabling us, don't show

        if (!mExternallyEnabled) {

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



            // note: we *should* set mNeedToReshowWhenReenabled=true here, but that makes

            // for an occasional ugly flicker in this situation:

            // 1) receive a call with the screen on (no keyguard) or make a call

            // 2) screen times out

            // 3) user hits key to turn screen back on

            // instead, we reenable the keyguard when we know the screen is off and the call

            // ends (see the broadcast receiver below)

            // TODO: clean this up when we have better support at the window manager level

            // for apps that wish to be on top of the keyguard

            return;

        }



        // if the keyguard is already showing, don't bother

        if (mKeyguardViewManager.isShowing()) {

            if (DEBUG) Log.d(TAG, "doKeyguard: not showing because it is already showing");
@@ -964,6 +948,22 @@ public class KeyguardViewMediator { 
            return;

        }



        // if another app is disabling us, don't show

        if (!mExternallyEnabled && !lockedOrMissing) {

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



            // note: we *should* set mNeedToReshowWhenReenabled=true here, but that makes

            // for an occasional ugly flicker in this situation:

            // 1) receive a call with the screen on (no keyguard) or make a call

            // 2) screen times out

            // 3) user hits key to turn screen back on

            // instead, we reenable the keyguard when we know the screen is off and the call

            // ends (see the broadcast receiver below)

            // TODO: clean this up when we have better support at the window manager level

            // for apps that wish to be on top of the keyguard

            return;

        }



        if (mUserManager.getUsers(true).size() < 2

                && mLockPatternUtils.isLockScreenDisabled() && !lockedOrMissing) {

            if (DEBUG) Log.d(TAG, "doKeyguard: not showing because lockscreen is off");