Handle when sim state indicates that it is absent
We want to update the sim state the view mediator when the sim state
indicates that it is absent. When we disable the esim, we want to be
able to update the sim state to indicate that we no longer have secure
sim pin when we swipe to unlock. Additionally, we want to ensure that
mPendingPinLock is set to false so that we do not show keyguard again
after dismissing.
Fixes: 286520191
Test: disable esim in sim when security method is None
Test: unlock sim when security method is None
Test: disable esim in simpuk when security method is None
Test: unlock simpuk when securith method is None
Test: disable esim in sim when security method is Swipe
Test: unlock sim when security method is Swipe
Test: disable esim in simpuk when security method is Swipe
Test: unlock simpuk when securith method is Swipe
Test: disable esim in sim when security method is Pin
Test: unlock sim when security method is Pin
Test: disable esim in simpuk when security method is Pin
Test: unlock simpuk when securith method is Pin
Change-Id: I69ef1698d1c3b3833cbbe925999dd4aa87cc00eb
Merged-In: I69ef1698d1c3b3833cbbe925999dd4aa87cc00eb
(cherry picked from commit 5866a4a23a)
This commit is contained in:
@@ -296,6 +296,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
private static final ComponentName FALLBACK_HOME_COMPONENT = new ComponentName(
|
||||
"com.android.settings", "com.android.settings.FallbackHome");
|
||||
|
||||
private static final List<Integer> ABSENT_SIM_STATE_LIST = Arrays.asList(
|
||||
TelephonyManager.SIM_STATE_ABSENT,
|
||||
TelephonyManager.SIM_STATE_UNKNOWN,
|
||||
TelephonyManager.SIM_STATE_NOT_READY);
|
||||
|
||||
private final Context mContext;
|
||||
private final UserTracker mUserTracker;
|
||||
private final KeyguardUpdateMonitorLogger mLogger;
|
||||
@@ -3698,8 +3703,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
mLogger.logSimState(subId, slotId, state);
|
||||
|
||||
boolean becameAbsent = false;
|
||||
if (!SubscriptionManager.isValidSubscriptionId(subId)
|
||||
&& state != TelephonyManager.SIM_STATE_UNKNOWN) {
|
||||
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
|
||||
mLogger.w("invalid subId in handleSimStateChange()");
|
||||
/* Only handle No SIM(ABSENT) and Card Error(CARD_IO_ERROR) due to
|
||||
* handleServiceStateChange() handle other case */
|
||||
@@ -3717,11 +3721,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
}
|
||||
} else if (state == TelephonyManager.SIM_STATE_CARD_IO_ERROR) {
|
||||
updateTelephonyCapable(true);
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
becameAbsent |= ABSENT_SIM_STATE_LIST.contains(state);
|
||||
|
||||
SimData data = mSimDatas.get(subId);
|
||||
final boolean changed;
|
||||
if (data == null) {
|
||||
@@ -3734,7 +3738,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
||||
data.subId = subId;
|
||||
data.slotId = slotId;
|
||||
}
|
||||
if ((changed || becameAbsent) || state == TelephonyManager.SIM_STATE_UNKNOWN) {
|
||||
if ((changed || becameAbsent)) {
|
||||
for (int i = 0; i < mCallbacks.size(); i++) {
|
||||
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
||||
if (cb != null) {
|
||||
|
||||
@@ -642,6 +642,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
||||
switch (simState) {
|
||||
case TelephonyManager.SIM_STATE_NOT_READY:
|
||||
case TelephonyManager.SIM_STATE_ABSENT:
|
||||
case TelephonyManager.SIM_STATE_UNKNOWN:
|
||||
mPendingPinLock = false;
|
||||
// only force lock screen in case of missing sim if user hasn't
|
||||
// gone through setup wizard
|
||||
synchronized (KeyguardViewMediator.this) {
|
||||
@@ -706,9 +708,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
||||
}
|
||||
}
|
||||
break;
|
||||
case TelephonyManager.SIM_STATE_UNKNOWN:
|
||||
mPendingPinLock = false;
|
||||
break;
|
||||
default:
|
||||
if (DEBUG_SIM_STATES) Log.v(TAG, "Unspecific state: " + simState);
|
||||
break;
|
||||
|
||||
@@ -2935,6 +2935,16 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
|
||||
TelephonyManager.SIM_STATE_UNKNOWN);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnSimStateChanged_HandleSimStateNotReady() {
|
||||
KeyguardUpdateMonitorCallback keyguardUpdateMonitorCallback = spy(
|
||||
KeyguardUpdateMonitorCallback.class);
|
||||
mKeyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback);
|
||||
mKeyguardUpdateMonitor.handleSimStateChange(-1, 0, TelephonyManager.SIM_STATE_NOT_READY);
|
||||
verify(keyguardUpdateMonitorCallback).onSimStateChanged(-1, 0,
|
||||
TelephonyManager.SIM_STATE_NOT_READY);
|
||||
}
|
||||
|
||||
private void verifyFingerprintAuthenticateNeverCalled() {
|
||||
verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), any());
|
||||
verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), anyInt(),
|
||||
|
||||
Reference in New Issue
Block a user