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

Commit e67d1dfd authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Revert "Ensure that resetStateLocked is called" 

This reverts commit d1575cbd.

Reason for revert: Causes sim to remain when unlocked after restart


Change-Id: I04b1cc298ca827f101f8c94344c65c0c37b25a58
Fixes: 324526504
parent d1575cbd

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

+8 −9
Original line number Diff line number Diff line
@@ -689,19 +689,18 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, 
                            } else {

                                resetStateLocked();

                            }

                        } else {

                            if (lastSimStateWasLocked && mShowing) {

                                if (DEBUG_SIM_STATES) {

                                    Log.d(TAG, "SIM moved to "

                                            + "NOT_READY/ABSENT/UNKNOWN when the previous state "

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

                        }

                        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 (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: