| commit | a835609bf0f0f4b91b748b0895c5890a2914be65 | [log] [tgz] |
|---|---|---|
| author | tom hsu <tomhsu@google.com> | Thu Jan 28 10:17:06 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 28 10:17:06 2021 +0000 |
| tree | 197da8736674b476cfe5b4bad973f77ab95608ac | |
| parent | 6c495776ccb644786853017f32810a580a3f7daa [diff] | |
| parent | 8249689aed38d5ce529ce8fd1649a5a6bf6bbfa2 [diff] |
Avoid wrong telephonymanager with wrong sub id. am: ba845f7fe4 am: 8249689aed Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422724 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If14458d1aeaae0df381f12d32f492e529614d540
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();