PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid wrong telephonymanager with wrong sub id. am: ba845f7fe4

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13422724

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I68a58e6ba10fbae2625ab76ff0f079550b4426c9
This commit is contained in:
tom hsu
2021-01-28 09:57:21 +00:00
committed by Automerger Merge Worker
parent 2c4337ac0e ba845f7fe4
commit 8249689aed
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/deviceinfo/simstatus/SimStatusDialogController.java
View File

@@ -233,7 +233,8 @@ public class SimStatusDialogController implements LifecycleObserver {
if (mSubscriptionInfo == null) { if (mSubscriptionInfo == null) {
return; return;
} }
mTelephonyManager =
mTelephonyManager.createForSubscriptionId(mSubscriptionInfo.getSubscriptionId());
mPhoneStateListener = getPhoneStateListener(); mPhoneStateListener = getPhoneStateListener();
updateLatestAreaInfo(); updateLatestAreaInfo();
updateSubscriptionStatus(); updateSubscriptionStatus();

2
tests/unit/src/com/android/settings/deviceinfo/simstatus/SimStatusDialogControllerTest.java
View File

@@ -136,7 +136,7 @@ public class SimStatusDialogControllerTest {
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId( doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
SubscriptionManager.DEFAULT_SUBSCRIPTION_ID); anyInt());
doReturn(2).when(mTelephonyManager).getCardIdForDefaultEuicc(); doReturn(2).when(mTelephonyManager).getCardIdForDefaultEuicc();
doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mTelephonyManager).getDataNetworkType(); doReturn(TelephonyManager.NETWORK_TYPE_LTE).when(mTelephonyManager).getDataNetworkType();