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

Commit cd4cf674 authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Clean up SubscriptionInfoEntity unused fields 

It's safe since MobileNetworkDatabase is in memory only.

Bug: 348118234
Flag: EXEMPT clean up
Test: manual - check Mobile Settings
Change-Id: If170c65f4d0dfdc42c1cec9a56e25c516db4f75e
parent 034e6db9

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

+2 −16
Original line number Diff line number Diff line
@@ -474,30 +474,16 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions 
            return null;

        } else {

            getUiccInfoBySubscriptionInfo(uiccSlotInfos, subInfo);

            SubscriptionInfo firstRemovableSubInfo = SubscriptionUtil.getFirstRemovableSubscription(

                    context);

            if (DEBUG) {

                Log.d(TAG, "convert subscriptionInfo to entity for subId = " + subId);

            }

            return new SubscriptionInfoEntity(String.valueOf(subId),

                    subInfo.getSimSlotIndex(),

                    subInfo.getCarrierId(), subInfo.getDisplayName().toString(),

                    subInfo.getCarrierName() != null ? subInfo.getCarrierName().toString() : "",

                    subInfo.getDataRoaming(), subInfo.getMccString(), subInfo.getMncString(),

                    subInfo.getCountryIso(), subInfo.isEmbedded(), mCardId,

                    subInfo.getPortIndex(), subInfo.isOpportunistic(),

                    String.valueOf(subInfo.getGroupUuid()),

                    subInfo.getSubscriptionType(),

            return new SubscriptionInfoEntity(String.valueOf(subId), subInfo.getSimSlotIndex(),

                    subInfo.isEmbedded(), subInfo.isOpportunistic(),

                    SubscriptionUtil.getUniqueSubscriptionDisplayName(subInfo, context).toString(),

                    SubscriptionUtil.isSubscriptionVisible(mSubscriptionManager, context, subInfo),

                    SubscriptionUtil.getFormattedPhoneNumber(context, subInfo),

                    firstRemovableSubInfo == null ? false

                            : firstRemovableSubInfo.getSubscriptionId() == subId,

                    SubscriptionUtil.isDefaultSubscription(context, subId),

                    mSubscriptionManager.isValidSubscriptionId(subId),

                    mSubscriptionManager.isUsableSubscriptionId(subId),

                    mSubscriptionManager.isActiveSubscriptionId(subId),

                    true /*availableSubInfo*/,

                    mSubscriptionManager.getActiveDataSubscriptionId() == subId);

        }

    }

tests/unit/src/com/android/settings/network/InternetPreferenceControllerTest.java

+9 −22
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ import android.net.NetworkScoreManager; 
import android.net.wifi.WifiManager;

import android.os.Handler;

import android.os.Looper;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import androidx.lifecycle.Lifecycle;

import androidx.lifecycle.LifecycleOwner;
@@ -78,15 +76,8 @@ public class InternetPreferenceControllerTest { 
    private static final String NOT_CONNECTED = "Not connected";

    private static final String SUB_ID_1 = "1";

    private static final String SUB_ID_2 = "2";

    private static final String INVALID_SUB_ID = "-1";

    private static final String DISPLAY_NAME_1 = "Sub 1";

    private static final String DISPLAY_NAME_2 = "Sub 2";

    private static final String SUB_MCC_1 = "123";

    private static final String SUB_MNC_1 = "456";

    private static final String SUB_MCC_2 = "223";

    private static final String SUB_MNC_2 = "456";

    private static final String SUB_COUNTRY_ISO_1 = "Sub 1";

    private static final String SUB_COUNTRY_ISO_2 = "Sub 2";



    @Rule

    public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@@ -178,14 +169,10 @@ public class InternetPreferenceControllerTest { 
    }



    private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, int slotId,

            int carrierId, String displayName, String mcc, String mnc, String countryIso,

            int cardId, boolean isVisible, boolean isValid, boolean isActive, boolean isAvailable,

            String displayName, boolean isVisible, boolean isValid, boolean isActive,

            boolean isActiveData) {

        return new SubscriptionInfoEntity(subId, slotId, carrierId,

                displayName, displayName, 0, mcc, mnc, countryIso, false, cardId,

                TelephonyManager.DEFAULT_PORT_INDEX, false, null,

                SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, isVisible,

                "1234567890", true, false, isValid, true, isActive, isAvailable, isActiveData);

        return new SubscriptionInfoEntity(subId, slotId, false, false, displayName, isVisible,

                false, isValid, isActive, isActiveData);

    }



    @Test
@@ -253,10 +240,10 @@ public class InternetPreferenceControllerTest { 
    @Test

    public void updateCellularSummary_getActiveSubscriptionInfo_cbrs() {

        mController.setDefaultDataSubscriptionId(Integer.parseInt(SUB_ID_2));

        mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, false, true, true, true, true);

        mDefaultDataSubInfo = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,

                SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, false, true, true, true, false);

        mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1,

                false, true, true, true);

        mDefaultDataSubInfo = setupSubscriptionInfoEntity(SUB_ID_2, 1, DISPLAY_NAME_2,

                false, true, true, false);

        mSubscriptionInfoEntityList.add(mActiveSubInfo);

        mSubscriptionInfoEntityList.add(mDefaultDataSubInfo);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -265,8 +252,8 @@ public class InternetPreferenceControllerTest { 
        mController.updateCellularSummary();

        assertThat(mPreference.getSummary()).isEqualTo(DISPLAY_NAME_2);



        mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true, true, true);

        mActiveSubInfo = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1,

                true, true, true, true);

        mSubscriptionInfoEntityList.add(mActiveSubInfo);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);

        mController.onAvailableSubInfoChanged(mSubscriptionInfoEntityList);

tests/unit/src/com/android/settings/network/NetworkProviderSimListControllerTest.java

+9 −25
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static org.mockito.Mockito.when; 
import android.content.Context;

import android.os.Looper;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.TextUtils;



import androidx.lifecycle.LifecycleOwner;
@@ -63,12 +62,6 @@ public class NetworkProviderSimListControllerTest { 
    private static final String KEY_PREFERENCE_CATEGORY_SIM = "provider_model_sim_category";

    private static final String DISPLAY_NAME_1 = "Sub 1";

    private static final String DISPLAY_NAME_2 = "Sub 2";

    private static final String SUB_MCC_1 = "123";

    private static final String SUB_MNC_1 = "456";

    private static final String SUB_MCC_2 = "223";

    private static final String SUB_MNC_2 = "456";

    private static final String SUB_COUNTRY_ISO_1 = "Sub 1";

    private static final String SUB_COUNTRY_ISO_2 = "Sub 2";



    @Mock

    private SubscriptionInfoEntity mSubInfo1;
@@ -140,12 +133,9 @@ public class NetworkProviderSimListControllerTest { 
    }



    private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, int slotId,

            int carrierId, String displayName, String mcc, String mnc, String countryIso,

            int cardId, boolean isValid, boolean isActive, boolean isAvailable) {

        return new SubscriptionInfoEntity(subId, slotId, carrierId, displayName, displayName, 0,

                mcc, mnc, countryIso, false, cardId, TelephonyManager.DEFAULT_PORT_INDEX, false,

                null, SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,

                "1234567890", true, false, isValid, true, isActive, isAvailable, false);

            String displayName, boolean isValid, boolean isActive) {

        return new SubscriptionInfoEntity(subId, slotId, false, false, displayName, false,

                false, isValid, isActive, false);

    }



    private String setSummaryResId(String resName, String value) {
@@ -159,8 +149,7 @@ public class NetworkProviderSimListControllerTest { 
    @Test

    @UiThreadTest

    public void getSummary_tapToActivePSim() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, false, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, false);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);

        displayPreferenceWithLifecycle();
@@ -172,8 +161,7 @@ public class NetworkProviderSimListControllerTest { 
    @Test

    @UiThreadTest

    public void getSummary_inactivePSim() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, false, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, false);

        doReturn(true).when(mSubscriptionManager).canDisablePhysicalSubscription();

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -187,8 +175,7 @@ public class NetworkProviderSimListControllerTest { 
    @Test

    @UiThreadTest

    public void getSummary_defaultCalls() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, true);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -209,8 +196,7 @@ public class NetworkProviderSimListControllerTest { 
        defaultConfig.append(setSummaryResId("default_active_sim_calls"))

                .append(", ")

                .append(setSummaryResId("default_active_sim_sms"));

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, true);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
@@ -228,10 +214,8 @@ public class NetworkProviderSimListControllerTest { 
    @Test

    @UiThreadTest

    public void getAvailablePhysicalSubscription_withTwoPhysicalSims_returnTwo() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,

                SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,

                SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, DISPLAY_NAME_1, true, true);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, DISPLAY_NAME_2, true, true);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);

        mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);

tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java

+21 −52
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.platform.test.flag.junit.SetFlagsRule; 
import android.telecom.TelecomManager;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;



import androidx.lifecycle.LifecycleOwner;

import androidx.lifecycle.LifecycleRegistry;
@@ -70,15 +69,6 @@ public class DefaultSubscriptionControllerTest { 
    private static final String DISPLAY_NAME_1 = "Sub 1";

    private static final String DISPLAY_NAME_2 = "Sub 2";

    private static final String DISPLAY_NAME_3 = "Sub 3";

    private static final String SUB_MCC_1 = "123";

    private static final String SUB_MNC_1 = "456";

    private static final String SUB_MCC_2 = "223";

    private static final String SUB_MNC_2 = "456";

    private static final String SUB_MCC_3 = "323";

    private static final String SUB_MNC_3 = "456";

    private static final String SUB_COUNTRY_ISO_1 = "Sub 1";

    private static final String SUB_COUNTRY_ISO_2 = "Sub 2";

    private static final String SUB_COUNTRY_ISO_3 = "Sub 3";



    @Mock

    private SubscriptionManager mSubMgr;
@@ -133,12 +123,9 @@ public class DefaultSubscriptionControllerTest { 
        SubscriptionUtil.setActiveSubscriptionsForTesting(null);

    }



    private SubscriptionInfoEntity setupSubscriptionInfoEntity(

            String subId, String displayName, String mcc, String mnc, String countryIso) {

        return new SubscriptionInfoEntity(subId, 1, 1, displayName, displayName, 0, mcc, mnc,

                countryIso, false, 1, TelephonyManager.DEFAULT_PORT_INDEX, false, null,

                SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false, "1234567890",

                true, false, true, true, true, true, false);

    private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, String displayName) {

        return new SubscriptionInfoEntity(subId, 1, false, false, displayName, false, false, true,

                true, false);

    }



    @Test
@@ -151,8 +138,7 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void getSummary_singleSub() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mController.displayPreference(mScreen);
@@ -164,10 +150,8 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void getSummary_twoSubs() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
@@ -180,10 +164,8 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void onPreferenceChange_prefChangedToSub2_callbackCalledCorrectly() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);
@@ -197,10 +179,8 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void onPreferenceChange_prefChangedToAlwaysAsk_callbackCalledCorrectly() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);
@@ -217,10 +197,8 @@ public class DefaultSubscriptionControllerTest { 
    @Test

    public void onPreferenceChange_prefBecomesAvailable_onPreferenceChangeCallbackNotNull() {

        // Start with only one sub active, so the pref is not available

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
@@ -240,10 +218,8 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);
@@ -261,10 +237,8 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void onSubscriptionsChanged_goFromTwoSubscriptionsToOne_prefDisappears() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));
@@ -287,10 +261,8 @@ public class DefaultSubscriptionControllerTest { 
    @Test

    @UiThreadTest

    public void onSubscriptionsChanged_goFromOneSubscriptionToTwo_prefAppears() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList);
@@ -309,12 +281,9 @@ public class DefaultSubscriptionControllerTest { 


    @Test

    public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1,

                SUB_COUNTRY_ISO_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, SUB_MCC_2, SUB_MNC_2,

                SUB_COUNTRY_ISO_2);

        mSubInfo3 = setupSubscriptionInfoEntity(SUB_ID_3, DISPLAY_NAME_3, SUB_MCC_3, SUB_MNC_3,

                SUB_COUNTRY_ISO_3);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2);

        mSubInfo3 = setupSubscriptionInfoEntity(SUB_ID_3, DISPLAY_NAME_3);

        mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId));

        mSubscriptionInfoEntityList.add(mSubInfo1);

        mSubscriptionInfoEntityList.add(mSubInfo2);

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

+10 −16
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import android.app.Instrumentation; 
import android.content.Context;

import android.os.Looper;

import android.platform.test.flag.junit.SetFlagsRule;

import android.telephony.SubscriptionInfo;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;
@@ -75,8 +74,6 @@ public class MobileDataPreferenceControllerTest { 
    @Mock

    private SubscriptionManager mSubscriptionManager;

    @Mock

    private SubscriptionInfo mSubscriptionInfo;

    @Mock

    private FragmentTransaction mFragmentTransaction;

    @Mock

    private Lifecycle mLifecycle;
@@ -120,13 +117,10 @@ public class MobileDataPreferenceControllerTest { 
    }



    private SubscriptionInfoEntity setupSubscriptionInfoEntity(String subId, String displayName,

            boolean isOpportunistic, boolean isValid, boolean isActive, boolean isAvailable) {

            boolean isOpportunistic, boolean isValid, boolean isActive) {

        int id = Integer.parseInt(subId);

        return new SubscriptionInfoEntity(subId, id, id,

                displayName, displayName, 0, "mcc", "mnc", "countryIso", false, id,

                TelephonyManager.DEFAULT_PORT_INDEX, isOpportunistic, null,

                SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, displayName, false,

                "1234567890", true, false, isValid, true, isActive, isAvailable, false);

        return new SubscriptionInfoEntity(subId, id, false, isOpportunistic, displayName, false,

                false, isValid, isActive, false);

    }



    private MobileNetworkInfoEntity setupMobileNetworkInfoEntity(String subId,
@@ -144,7 +138,7 @@ public class MobileDataPreferenceControllerTest { 


    @Test

    public void isDialogNeeded_disableSingleSim_returnFalse() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true);

        mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);

        doReturn(1).when(mTelephonyManager).getActiveModemCount();
@@ -153,12 +147,12 @@ public class MobileDataPreferenceControllerTest { 


    @Test

    public void isDialogNeeded_enableNonDefaultSimInMultiSimMode_returnTrue() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true);

        mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), false);

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

        // Ideally, it would be better if we could set the default data subscription to

        // SUB_ID_OTHER, and set that as an active subscription id.

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, false, true, true, true);

        mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, DISPLAY_NAME_2, false, true, true);

        mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);

        doReturn(2).when(mTelephonyManager).getActiveModemCount();
@@ -180,7 +174,7 @@ public class MobileDataPreferenceControllerTest { 


    @Test

    public void onPreferenceChange_singleSim_On_shouldEnableData() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true);

        mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);

        mController.setSubscriptionInfoEntity(mSubInfo1);

        mController.setMobileNetworkInfoEntity(mNetworkInfo1);
@@ -194,7 +188,7 @@ public class MobileDataPreferenceControllerTest { 


    @Test

    public void onPreferenceChange_multiSim_On_shouldEnableData() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true);

        mNetworkInfo1 = setupMobileNetworkInfoEntity(String.valueOf(SUB_ID), true);

        mController.setSubscriptionInfoEntity(mSubInfo1);

        mController.setMobileNetworkInfoEntity(mNetworkInfo1);
@@ -219,7 +213,7 @@ public class MobileDataPreferenceControllerTest { 


    @Test

    public void updateState_opportunistic_disabled() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, true, true, true);

        mController.init(mFragmentManager, SUB_ID, mSubInfo1, mNetworkInfo1);

        mController.updateState(mPreference);
@@ -231,7 +225,7 @@ public class MobileDataPreferenceControllerTest { 


    @Test

    public void updateState_notOpportunistic_enabled() {

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true, true);

        mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, DISPLAY_NAME_1, false, true, true);

        mController.init(mFragmentManager, SUB_ID, mSubInfo1, mNetworkInfo1);

        mController.updateState(mPreference);