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

Commit 7ecae6dd authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "[Settings] Refactor DisabledSubscriptionController" am: 0972a6dd 

Change-Id: I07ac521d3822a644cad29667a59fd1ae0bf848a3
parents a0d1887a 0972a6dd

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

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();

    }