diff --git a/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java b/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java index b1b5f8e69ed..bd6a394f597 100644 --- a/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java +++ b/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java @@ -195,7 +195,7 @@ public class EnableAutoDataSwitchDialogFragment extends SimDialogFragment implem } private SubscriptionManager getSubscriptionManager() { - return getContext().getSystemService(SubscriptionManager.class); + return getContext().getSystemService(SubscriptionManager.class).createForAllUserProfiles(); } @VisibleForTesting diff --git a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java index 37f5445238e..b0b65f66e2e 100644 --- a/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java +++ b/src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java @@ -194,7 +194,7 @@ public class SelectSpecificDataSimDialogFragment extends SimDialogFragment imple @VisibleForTesting protected SubscriptionManager getSubscriptionManager() { - return getContext().getSystemService(SubscriptionManager.class); + return getContext().getSystemService(SubscriptionManager.class).createForAllUserProfiles(); } @Override diff --git a/src/com/android/settings/sim/SimListDialogFragment.java b/src/com/android/settings/sim/SimListDialogFragment.java index db2c4dc224d..fd44dc74a67 100644 --- a/src/com/android/settings/sim/SimListDialogFragment.java +++ b/src/com/android/settings/sim/SimListDialogFragment.java @@ -125,7 +125,7 @@ public class SimListDialogFragment extends SimDialogFragment { protected List getCurrentSubscriptions() { final SubscriptionManager manager = getContext().getSystemService( - SubscriptionManager.class); + SubscriptionManager.class).createForAllUserProfiles(); return manager.getActiveSubscriptionInfoList(); } diff --git a/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java b/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java index ad60d06dc04..24b82b2fffb 100644 --- a/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java @@ -68,6 +68,7 @@ public class EnableAutoDataSwitchDialogFragmentTest doReturn(mContext).when(mFragment).getContext(); doReturn(mSubscriptionManager).when(mContext).getSystemService(SubscriptionManager.class); + doReturn(mSubscriptionManager).when(mSubscriptionManager).createForAllUserProfiles(); doReturn(mTelephonyManager).when(mContext).getSystemService(TelephonyManager.class); doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(anyInt()); doReturn(mUserManager).when(mContext).getSystemService(UserManager.class);