Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 704f8797 authored by Ling Ma's avatar Ling Ma Committed by Android (Google) Code Review
Browse files

Merge "Wrap subManager creation with createForAllProfiles" into main

parents f6b93772 ae8b9b5f

src/com/android/settings/sim/EnableAutoDataSwitchDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/sim/SelectSpecificDataSimDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/sim/SimListDialogFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ public class SimListDialogFragment extends SimDialogFragment { 


    protected List<SubscriptionInfo> getCurrentSubscriptions() {

        final SubscriptionManager manager = getContext().getSystemService(

                SubscriptionManager.class);

                SubscriptionManager.class).createForAllUserProfiles();

        return manager.getActiveSubscriptionInfoList();

    }

tests/robotests/src/com/android/settings/sim/EnableAutoDataSwitchDialogFragmentTest.java

+1 −0
Original line number Diff line number Diff line
@@ -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);