| commit | ba845f7fe438cb6c69c8df3a558603e6e66f8a11 | [log] [tgz] |
|---|---|---|
| author | tom hsu <tomhsu@google.com> | Tue Dec 29 20:03:08 2020 +0800 |
| committer | Tom Hsu <tomhsu@google.com> | Thu Jan 28 06:26:21 2021 +0000 |
| tree | 6fbaa7d61285cb49c1e171a823a9aa51d1851b0f | |
| parent | f38af98895ac65ff7f1afb742fdfc3f51d6051ba [diff] |
Avoid wrong telephonymanager with wrong sub id. When initialized SimStatusDialogController, also create TelephonyManager with sub id. Bug: 174171839 Test: Manual test passed, see b/174171839#25 Change-Id: I6bd6975e39c75884252b9d0bcd9d5548dbdfe6d5
diff --git a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java index 414039b..ee99e09 100644 --- a/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java +++ b/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
@@ -233,7 +233,8 @@ if (mSubscriptionInfo == null) { return; } - + mTelephonyManager = + mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId()); mPhoneStateListener = getPhoneStateListener(); updateLatestAreaInfo(); updateSubscriptionStatus();
diff --git a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java index e94c4e7..ae534d0 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
@@ -136,7 +136,7 @@ when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId( - SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); + anyInt()); doReturn(2).when(mTelephonyManager).getCardIdForDefaultEuicc(); doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mTelephonyManager).getDataNetworkType();