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

Commit 0304f4d1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace isSubscriptionEnabled with isActiveSubId." into qt-dev

parents e2ab7540 dd0b2fc3

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

+2 −1
Original line number Diff line number Diff line
@@ -72,7 +72,8 @@ public class DisabledSubscriptionController extends BasePreferenceController imp 
        if (mCategory == null || mSubId ==  SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            return;

        }

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

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

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

    }



    @Override

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

+6 −2
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ public class MobileNetworkSwitchController extends BasePreferenceController impl 
                R.string.mobile_network_use_sim_off);



        mSwitchBar.addOnSwitchChangeListener((switchView, isChecked) -> {

            if (mSubscriptionManager.isSubscriptionEnabled(mSubId) != isChecked

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

            // mSubscriptionManager#isSubscriptionEnabled

            if (mSubscriptionManager.isActiveSubId(mSubId) != isChecked

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

                mSwitchBar.setChecked(!isChecked);

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

        } else {

            mSwitchBar.show();

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

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

            // mSubscriptionManager#isSubscriptionEnabled

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

        }

    }

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).isSubscriptionEnabled(SUB_ID);

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

        mController.displayPreference(mScreen);

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

    }



    @Test

    public void displayPreference_subscriptionDisabled_categoryIsNotVisible() {

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

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

        mController.displayPreference(mScreen);

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

    }



    @Test

    public void onSubscriptionsChanged_subscriptionBecomesDisabled_categoryIsNotVisible() {

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

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

        mController.displayPreference(mScreen);

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

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

        mController.onSubscriptionsChanged();

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

    }



    @Test

    public void onSubscriptionsChanged_subscriptionBecomesEnabled_categoryIsVisible() {

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

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

        mController.displayPreference(mScreen);

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

        doReturn(true).when(mSubscriptionManager).isActiveSubId(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
@@ -109,7 +109,7 @@ public class MobileNetworkSwitchControllerTest { 


    @Test

    public void displayPreference_oneEnabledSubscription_switchBarNotHidden() {

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

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

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

        mController.displayPreference(mScreen);

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


    @Test

    public void displayPreference_oneDisabledSubscription_switchBarNotHidden() {

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

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

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

        mController.displayPreference(mScreen);

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


    @Test

    public void displayPreference_subscriptionEnabled_switchIsOn() {

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

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

        mController.displayPreference(mScreen);

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

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


    @Test

    public void displayPreference_subscriptionDisabled_switchIsOff() {

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

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

        mController.displayPreference(mScreen);

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

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


    @Test

    public void switchChangeListener_fromEnabledToDisabled_setSubscriptionEnabledCalledCorrectly() {

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

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

        mController.displayPreference(mScreen);

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

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

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

                .thenReturn(false);

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

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

        mController.displayPreference(mScreen);

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

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


    @Test

    public void switchChangeListener_fromDisabledToEnabled_setSubscriptionEnabledCalledCorrectly() {

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

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

        mController.displayPreference(mScreen);

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

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