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

Commit d12075a9 authored by Michele Berionne's avatar Michele Berionne
Browse files

Hide keyguard when SIM transitions to READY 

The keyguard is not properly updated when the SIM PIN verification is
performed using different means than the UI. Additional states are used
before READY, so simWasLocked might be false.

Bug: 160784387
Test: manual
Change-Id: Ibca04e3d6a61c27d4b40f94a8a6223d9739b15ac
parent ceb8ce05

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

+16 −5
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.telephony.TelephonyManager; 
import android.util.EventLog;

import android.util.Log;

import android.util.Slog;

import android.util.SparseBooleanArray;

import android.util.SparseIntArray;

import android.view.IRemoteAnimationFinishedCallback;

import android.view.RemoteAnimationTarget;
@@ -306,6 +307,13 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
     */

    private final SparseIntArray mLastSimStates = new SparseIntArray();



    /**

     * Indicates if a SIM card had the SIM PIN enabled during the initialization, before

     * reaching the SIM_STATE_READY state. The flag is reset to false at SIM_STATE_READY.

     * Index is the slotId - in case of multiple SIM cards.

     */

    private final SparseBooleanArray mSimWasLocked = new SparseBooleanArray();



    private boolean mDeviceInteractive;

    private boolean mGoingToSleep;
@@ -477,10 +485,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                }

            }



            boolean simWasLocked;

            boolean lastSimStateWasLocked;

            synchronized (KeyguardViewMediator.this) {

                int lastState = mLastSimStates.get(slotId);

                simWasLocked = (lastState == TelephonyManager.SIM_STATE_PIN_REQUIRED

                lastSimStateWasLocked = (lastState == TelephonyManager.SIM_STATE_PIN_REQUIRED

                        || lastState == TelephonyManager.SIM_STATE_PUK_REQUIRED);

                mLastSimStates.append(slotId, simState);

            }
@@ -504,17 +512,19 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                        if (simState == TelephonyManager.SIM_STATE_ABSENT) {

                            // MVNO SIMs can become transiently NOT_READY when switching networks,

                            // so we should only lock when they are ABSENT.

                            if (simWasLocked) {

                            if (lastSimStateWasLocked) {

                                if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to ABSENT when the "

                                        + "previous state was locked. Reset the state.");

                                resetStateLocked();

                            }

                            mSimWasLocked.append(slotId, false);

                        }

                    }

                    break;

                case TelephonyManager.SIM_STATE_PIN_REQUIRED:

                case TelephonyManager.SIM_STATE_PUK_REQUIRED:

                    synchronized (KeyguardViewMediator.this) {

                        mSimWasLocked.append(slotId, true);

                        if (!mShowing) {

                            if (DEBUG_SIM_STATES) Log.d(TAG,

                                    "INTENT_VALUE_ICC_LOCKED and keygaurd isn't "
@@ -541,9 +551,10 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable, 
                case TelephonyManager.SIM_STATE_READY:

                    synchronized (KeyguardViewMediator.this) {

                        if (DEBUG_SIM_STATES) Log.d(TAG, "READY, reset state? " + mShowing);

                        if (mShowing && simWasLocked) {

                        if (mShowing && mSimWasLocked.get(slotId, false)) {

                            if (DEBUG_SIM_STATES) Log.d(TAG, "SIM moved to READY when the "

                                    + "previous state was locked. Reset the state.");

                                    + "previously was locked. Reset the state.");

                            mSimWasLocked.append(slotId, false);

                            resetStateLocked();

                        }

                    }