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

Commit 4b7bdb0d authored by Betty Chang's avatar Betty Chang Committed by Android (Google) Code Review
Browse files

Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline"

parents 65a0488e f4d27715

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

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class DisabledSubscriptionController extends BasePreferenceController imp 
            return;

        }

        // TODO b/135222940: re-evaluate whether to use mSubscriptionManager#isSubscriptionEnabled

        mCategory.setVisible(mSubscriptionManager.isActiveSubId(mSubId));

        mCategory.setVisible(mSubscriptionManager.isActiveSubscriptionId(mSubId));

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl 
        mSwitchBar.addOnSwitchChangeListener((switchView, isChecked) -> {

            // TODO b/135222940: re-evaluate whether to use

            // mSubscriptionManager#isSubscriptionEnabled

            if (mSubscriptionManager.isActiveSubId(mSubId) != isChecked

            if (mSubscriptionManager.isActiveSubscriptionId(mSubId) != isChecked

                    && (!mSubscriptionManager.setSubscriptionEnabled(mSubId, isChecked))) {

                mSwitchBar.setChecked(!isChecked);

            }
@@ -106,7 +106,7 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl 
            mSwitchBar.hide();

        } else {

            mSwitchBar.show();

            mSwitchBar.setChecked(mSubscriptionManager.isActiveSubId(mSubId));

            mSwitchBar.setChecked(mSubscriptionManager.isActiveSubscriptionId(mSubId));

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ public class SimSelectNotification extends BroadcastReceiver { 


        SubscriptionManager subscriptionManager = ((SubscriptionManager) context.getSystemService(

                Context.TELEPHONY_SUBSCRIPTION_SERVICE));

        if (!subscriptionManager.isActiveSubId(subId)) {

        if (!subscriptionManager.isActiveSubscriptionId(subId)) {

            Log.w(TAG, "onEnableMmsDataRequest invalid sub ID " + subId);

            return;

        }

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

+6 −6
Original line number Diff line number Diff line
@@ -69,32 +69,32 @@ public class DisabledSubscriptionControllerTest { 


    @Test

    public void displayPreference_subscriptionEnabled_categoryIsVisible() {

        doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID);

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

        mController.displayPreference(mScreen);

        assertThat(mCategory.isVisible()).isTrue();

    }



    @Test

    public void displayPreference_subscriptionDisabled_categoryIsNotVisible() {

        doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID);

        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);

        mController.displayPreference(mScreen);

        assertThat(mCategory.isVisible()).isFalse();

    }



    @Test

    public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() {

        doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID);

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

        mController.displayPreference(mScreen);

        doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID);

        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);

        mController.onSubscriptionsChanged();

        assertThat(mCategory.isVisible()).isFalse();

    }



    @Test

    public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() {

        doReturn(false).when(mSubscriptionManager).isActiveSubId(SUB_ID);

        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(SUB_ID);

        mController.displayPreference(mScreen);

        doReturn(true).when(mSubscriptionManager).isActiveSubId(SUB_ID);

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

        mController.onSubscriptionsChanged();

        assertThat(mCategory.isVisible()).isTrue();

    }

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

+7 −7
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {

        doReturn(true).when(mSubscriptionManager).isActiveSubId(mSubId);

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

        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();
@@ -121,7 +121,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {

        doReturn(false).when(mSubscriptionManager).isActiveSubId(mSubId);

        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(mSubId);

        SubscriptionUtil.setAvailableSubscriptionsForTesting(Arrays.asList(mSubscription));

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();
@@ -129,7 +129,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void displayPreference_subscriptionEnabled_switchIsOn() {

        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();

        assertThat(mSwitchBar.isChecked()).isTrue();
@@ -137,7 +137,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void displayPreference_subscriptionDisabled_switchIsOff() {

        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(false);

        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();

        assertThat(mSwitchBar.isChecked()).isFalse();
@@ -145,7 +145,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {

        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();

        assertThat(mSwitchBar.isChecked()).isTrue();
@@ -157,7 +157,7 @@ public class MobileNetworkSwitchControllerTest { 
    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledFailed() {

        when(mSubscriptionManager.setSubscriptionEnabled(eq(mSubId), anyBoolean()))

                .thenReturn(false);

        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(true);

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();

        assertThat(mSwitchBar.isChecked()).isTrue();
@@ -168,7 +168,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {

        when(mSubscriptionManager.isActiveSubId(mSubId)).thenReturn(false);

        when(mSubscriptionManager.isActiveSubscriptionId(mSubId)).thenReturn(false);

        mController.displayPreference(mScreen);

        assertThat(mSwitchBar.isShowing()).isTrue();

        assertThat(mSwitchBar.isChecked()).isFalse();