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

Merge "Wrap subManager creation with createForAllProfiles" into main

Browse Source
This commit is contained in:
Ling Ma
2024-01-24 02:25:58 +00:00
committed by Android (Google) Code Review
parent f6b93772c4 ae8b9b5fe2
commit 704f8797ea
4 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java
View File

@@ -195,7 +195,7 @@ public class EnableAutoDataSwitchDialogFragment extends SimDialogFragment implem
} }
private SubscriptionManager getSubscriptionManager() { private SubscriptionManager getSubscriptionManager() {
return getContext().getSystemService(SubscriptionManager.class); return getContext().getSystemService(SubscriptionManager.class).createForAllUserProfiles();
} }
@VisibleForTesting @VisibleForTesting

2
src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java
View File

@@ -194,7 +194,7 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple
@VisibleForTesting @VisibleForTesting
protected SubscriptionManager getSubscriptionManager() { protected SubscriptionManager getSubscriptionManager() {
return getContext().getSystemService(SubscriptionManager.class); return getContext().getSystemService(SubscriptionManager.class).createForAllUserProfiles();
} }
@Override @Override

2
src/com/android/settings/sim/SimListDialogFragment.java
View File

@@ -125,7 +125,7 @@ public class SimListDialogFragment extends SimDialogFragment {
protected List<SubscriptionInfo> getCurrentSubscriptions() { protected List<SubscriptionInfo> getCurrentSubscriptions() {
final SubscriptionManager manager = getContext().getSystemService( final SubscriptionManager manager = getContext().getSystemService(
SubscriptionManager.class); SubscriptionManager.class).createForAllUserProfiles();
return manager.getActiveSubscriptionInfoList(); return manager.getActiveSubscriptionInfoList();
} }

1
tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java
View File

@@ -68,6 +68,7 @@ public class EnableAutoDataSwitchDialogFragmentTest
doReturn(mContext).when(mFragment).getContext(); doReturn(mContext).when(mFragment).getContext();
doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class);
doReturn(mSubscriptionManager).when(mSubscriptionManager).createForAllUserProfiles();
doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class); doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class);
doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt()); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt());
doReturn(mUserManager).when(mContext).getSystemService(UserManager.class); doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);