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
This commit is contained in:
@@ -303,6 +303,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
private static final ComponentName FALLBACK_HOME_COMPONENT = new ComponentName(
|
private static final ComponentName FALLBACK_HOME_COMPONENT = new ComponentName(
|
||||||
"com.android.settings", "com.android.settings.FallbackHome");
|
"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 Context mContext;
|
||||||
private final UserTracker mUserTracker;
|
private final UserTracker mUserTracker;
|
||||||
private final KeyguardUpdateMonitorLogger mLogger;
|
private final KeyguardUpdateMonitorLogger mLogger;
|
||||||
@@ -3742,8 +3747,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
mLogger.logSimState(subId, slotId, state);
|
mLogger.logSimState(subId, slotId, state);
|
||||||
|
|
||||||
boolean becameAbsent = false;
|
boolean becameAbsent = false;
|
||||||
if (!SubscriptionManager.isValidSubscriptionId(subId)
|
if (!SubscriptionManager.isValidSubscriptionId(subId)) {
|
||||||
&& state != TelephonyManager.SIM_STATE_UNKNOWN) {
|
|
||||||
mLogger.w("invalid subId in handleSimStateChange()");
|
mLogger.w("invalid subId in handleSimStateChange()");
|
||||||
/* Only handle No SIM(ABSENT) and Card Error(CARD_IO_ERROR) due to
|
/* Only handle No SIM(ABSENT) and Card Error(CARD_IO_ERROR) due to
|
||||||
* handleServiceStateChange() handle other case */
|
* handleServiceStateChange() handle other case */
|
||||||
@@ -3761,11 +3765,11 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
}
|
}
|
||||||
} else if (state == TelephonyManager.SIM_STATE_CARD_IO_ERROR) {
|
} else if (state == TelephonyManager.SIM_STATE_CARD_IO_ERROR) {
|
||||||
updateTelephonyCapable(true);
|
updateTelephonyCapable(true);
|
||||||
} else {
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
becameAbsent |= ABSENT_SIM_STATE_LIST.contains(state);
|
||||||
|
|
||||||
SimData data = mSimDatas.get(subId);
|
SimData data = mSimDatas.get(subId);
|
||||||
final boolean changed;
|
final boolean changed;
|
||||||
if (data == null) {
|
if (data == null) {
|
||||||
@@ -3778,7 +3782,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener, Dumpab
|
|||||||
data.subId = subId;
|
data.subId = subId;
|
||||||
data.slotId = slotId;
|
data.slotId = slotId;
|
||||||
}
|
}
|
||||||
if ((changed || becameAbsent) || state == TelephonyManager.SIM_STATE_UNKNOWN) {
|
if ((changed || becameAbsent)) {
|
||||||
for (int i = 0; i < mCallbacks.size(); i++) {
|
for (int i = 0; i < mCallbacks.size(); i++) {
|
||||||
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();
|
||||||
if (cb != null) {
|
if (cb != null) {
|
||||||
|
|||||||
@@ -649,6 +649,8 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
|||||||
switch (simState) {
|
switch (simState) {
|
||||||
case TelephonyManager.SIM_STATE_NOT_READY:
|
case TelephonyManager.SIM_STATE_NOT_READY:
|
||||||
case TelephonyManager.SIM_STATE_ABSENT:
|
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
|
// only force lock screen in case of missing sim if user hasn't
|
||||||
// gone through setup wizard
|
// gone through setup wizard
|
||||||
synchronized (KeyguardViewMediator.this) {
|
synchronized (KeyguardViewMediator.this) {
|
||||||
@@ -713,9 +715,6 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case TelephonyManager.SIM_STATE_UNKNOWN:
|
|
||||||
mPendingPinLock = false;
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
if (DEBUG_SIM_STATES) Log.v(TAG, "Unspecific state: " + simState);
|
if (DEBUG_SIM_STATES) Log.v(TAG, "Unspecific state: " + simState);
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -3001,6 +3001,16 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
|
|||||||
TelephonyManager.SIM_STATE_UNKNOWN);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void onAuthEnrollmentChangesCallbacksAreNotified() {
|
public void onAuthEnrollmentChangesCallbacksAreNotified() {
|
||||||
KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);
|
KeyguardUpdateMonitorCallback callback = mock(KeyguardUpdateMonitorCallback.class);
|
||||||
|
|||||||
Reference in New Issue
Block a user