Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Handle UNKNOWN sim state in KGVM." into udc-dev

Browse Source
This commit is contained in:
Aaron Liu
2023-06-09 18:01:52 +00:00
committed by Android (Google) Code Review
parent b541d4cd2a fb1db79cf4
commit 6be5cd2b97
3 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java
View File

@@ -3668,7 +3668,8 @@ 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 */
@@ -3703,7 +3704,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) || state == TelephonyManager.SIM_STATE_UNKNOWN) {
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) {

3
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -697,6 +697,9 @@ 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;

10
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
View File

@@ -2800,6 +2800,16 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
); );
} }
@Test
public void testOnSimStateChanged_Unknown() {
KeyguardUpdateMonitorCallback keyguardUpdateMonitorCallback = spy(
KeyguardUpdateMonitorCallback.class);
mKeyguardUpdateMonitor.registerCallback(keyguardUpdateMonitorCallback);
mKeyguardUpdateMonitor.handleSimStateChange(-1, 0, TelephonyManager.SIM_STATE_UNKNOWN);
verify(keyguardUpdateMonitorCallback).onSimStateChanged(-1, 0,
TelephonyManager.SIM_STATE_UNKNOWN);
}
private void verifyFingerprintAuthenticateNeverCalled() { private void verifyFingerprintAuthenticateNeverCalled() {
verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), any()); verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), any());
verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), anyInt(), verify(mFingerprintManager, never()).authenticate(any(), any(), any(), any(), anyInt(),