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

Commit 171eabcb authored by Zoey Chen's avatar Zoey Chen Committed by Gerrit Code Review
Browse files

Merge "[Settings] Replace #getSimCount with #getActiveModemCount"

parents 98e6ab35 5b336b1b

src/com/android/settings/network/MobileDataContentObserver.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class MobileDataContentObserver extends ContentObserver { 
    public static Uri getObservableUri(Context context, int subId) {

        Uri uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA);

        TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class);

        if (telephonyManager.getSimCount() != 1) {

        if (telephonyManager.getActiveModemCount() != 1) {

            uri = Settings.Global.getUriFor(Settings.Global.MOBILE_DATA + subId);

        }

        return uri;

src/com/android/settings/network/telephony/MobileDataPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ public class MobileDataPreferenceController extends TelephonyTogglePreferenceCon 
    @VisibleForTesting

    boolean isDialogNeeded() {

        final boolean enableData = !isChecked();

        final boolean isMultiSim = (mTelephonyManager.getSimCount() > 1);

        final boolean isMultiSim = (mTelephonyManager.getActiveModemCount() > 1);

        final int defaultSubId = mSubscriptionManager.getDefaultDataSubscriptionId();

        final boolean needToDisableOthers = mSubscriptionManager

                .isActiveSubscriptionId(defaultSubId) && defaultSubId != mSubId;

tests/robotests/src/com/android/settings/network/telephony/MobileDataPreferenceControllerTest.java

+4 −4
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ public class MobileDataPreferenceControllerTest { 
        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        doReturn(1).when(mTelephonyManager).getSimCount();

        doReturn(1).when(mTelephonyManager).getActiveModemCount();



        assertThat(mController.isDialogNeeded()).isFalse();

    }
@@ -110,7 +110,7 @@ public class MobileDataPreferenceControllerTest { 
        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID_OTHER);

        ShadowSubscriptionManager.setDefaultDataSubscriptionId(SUB_ID_OTHER);

        doReturn(2).when(mTelephonyManager).getSimCount();

        doReturn(2).when(mTelephonyManager).getActiveModemCount();



        assertThat(mController.isDialogNeeded()).isTrue();

        assertThat(mController.mDialogType).isEqualTo(
@@ -131,7 +131,7 @@ public class MobileDataPreferenceControllerTest { 
        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        doReturn(1).when(mTelephonyManager).getSimCount();

        doReturn(1).when(mTelephonyManager).getActiveModemCount();



        mController.onPreferenceChange(mPreference, true);
@@ -143,7 +143,7 @@ public class MobileDataPreferenceControllerTest { 
        doReturn(true).when(mTelephonyManager).isDataEnabled();

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(SUB_ID);

        doReturn(mSubscriptionInfo).when(mSubscriptionManager).getDefaultDataSubscriptionInfo();

        doReturn(2).when(mTelephonyManager).getSimCount();

        doReturn(2).when(mTelephonyManager).getActiveModemCount();



        mController.onPreferenceChange(mPreference, true);