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

Commit 0a1d1553 authored by Bonian Chen's avatar Bonian Chen Committed by Automerger Merge Worker
Browse files

Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1392547

Change-Id: Ibcaea10f983975809aa97635239f3b6850a22e9c
parents f42a022a 75b3666b

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

+2 −4
Original line number Diff line number Diff line
@@ -83,7 +83,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);

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

        } else {

            mSwitchBar.show();

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

            // mSubscriptionManager#isSubscriptionEnabled

            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/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).isActiveSubId(mSubId);

        doReturn(true).when(mSubscriptionManager).isActiveSubscriptionId(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).isActiveSubId(mSubId);

        doReturn(false).when(mSubscriptionManager).isActiveSubscriptionId(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.isActiveSubId(mSubId)).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(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.isActiveSubId(mSubId)).thenReturn(false);

        when(mSubscriptionManager.isActiveSubscriptionId(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.isActiveSubId(mSubId)).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(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.isActiveSubId(mSubId)).thenReturn(true);

        when(mSubscriptionManager.isActiveSubscriptionId(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.isActiveSubId(mSubId)).thenReturn(false);

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

        mController.displayPreference(mScreen);

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ public class SimSelectNotificationTest { 


        when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);

        when(mTelephonyManager.isDataEnabledForApn(TYPE_MMS)).thenReturn(false);

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

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

        when(mSubscriptionManager.getActiveSubscriptionInfo(mSubId)).thenReturn(mSubInfo);

        when(mSubInfo.getDisplayName()).thenReturn(mFakeDisplayName);

        when(mContext.getResources()).thenReturn(mResources);