diff --git a/src/com/android/settings/network/InternetPreferenceController.java b/src/com/android/settings/network/InternetPreferenceController.java index 6a75fcef8cd..b1bc694f3f9 100644 --- a/src/com/android/settings/network/InternetPreferenceController.java +++ b/src/com/android/settings/network/InternetPreferenceController.java @@ -45,6 +45,7 @@ import com.android.settings.widget.SummaryUpdater; import com.android.settings.wifi.WifiSummaryUpdater; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; +import com.android.settingslib.mobile.dataservice.DataServiceUtils; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.mobile.dataservice.UiccInfoEntity; @@ -237,9 +238,7 @@ public class InternetPreferenceController extends AbstractPreferenceController i @Override public void onAvailableSubInfoChanged(List subInfoEntityList) { - if ((mSubInfoEntityList != null && - (subInfoEntityList.isEmpty() || !subInfoEntityList.equals(mSubInfoEntityList))) - || (!subInfoEntityList.isEmpty() && mSubInfoEntityList == null)) { + if (DataServiceUtils.shouldUpdateEntityList(mSubInfoEntityList, subInfoEntityList)) { mSubInfoEntityList = subInfoEntityList; updateState(mPreference); } diff --git a/src/com/android/settings/network/MobileNetworkRepository.java b/src/com/android/settings/network/MobileNetworkRepository.java index 677e5f4abec..f6881380ea8 100644 --- a/src/com/android/settings/network/MobileNetworkRepository.java +++ b/src/com/android/settings/network/MobileNetworkRepository.java @@ -17,6 +17,8 @@ package com.android.settings.network; import static android.telephony.UiccSlotInfo.CARD_STATE_INFO_PRESENT; +import static com.android.internal.telephony.TelephonyIntents.ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED; + import android.app.settings.SettingsEnums; import android.content.BroadcastReceiver; import android.content.Context; @@ -125,6 +127,8 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions mAirplaneModeSettingUri = Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON); mFilter.addAction(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED); mFilter.addAction(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED); + mFilter.addAction(ACTION_DEFAULT_VOICE_SUBSCRIPTION_CHANGED); + mFilter.addAction(SubscriptionManager.ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED); } private class AirplaneModeObserver extends ContentObserver { @@ -152,11 +156,7 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions private final BroadcastReceiver mDataSubscriptionChangedReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - final String action = intent.getAction(); - if (action.equals(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED) - || action.equals(SubscriptionManager.ACTION_DEFAULT_SUBSCRIPTION_CHANGED)) { - onSubscriptionsChanged(); - } + onSubscriptionsChanged(); } }; @@ -171,7 +171,6 @@ public class MobileNetworkRepository extends SubscriptionManager.OnSubscriptions public void removeRegister() { mAirplaneModeObserver.unRegister(mContext); - mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver); if (mDataSubscriptionChangedReceiver != null) { mContext.unregisterReceiver(mDataSubscriptionChangedReceiver); } diff --git a/src/com/android/settings/network/MobileNetworkSummaryController.java b/src/com/android/settings/network/MobileNetworkSummaryController.java index a3799a2f78e..0bb1bb3b766 100644 --- a/src/com/android/settings/network/MobileNetworkSummaryController.java +++ b/src/com/android/settings/network/MobileNetworkSummaryController.java @@ -41,6 +41,7 @@ import com.android.settings.widget.AddPreference; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; +import com.android.settingslib.mobile.dataservice.DataServiceUtils; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.mobile.dataservice.UiccInfoEntity; @@ -226,10 +227,7 @@ public class MobileNetworkSummaryController extends AbstractPreferenceController @Override public void onAvailableSubInfoChanged(List subInfoEntityList) { - if ((mSubInfoEntityList != null && - (subInfoEntityList.isEmpty() || !subInfoEntityList.equals(mSubInfoEntityList))) - || (!subInfoEntityList.isEmpty() && mSubInfoEntityList == null)) { - Log.d(TAG, "subInfo list from framework is changed, update the subInfo entity list."); + if (DataServiceUtils.shouldUpdateEntityList(mSubInfoEntityList, subInfoEntityList)) { mSubInfoEntityList = subInfoEntityList; update(); } diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsController.java b/src/com/android/settings/network/NetworkProviderCallsSmsController.java index 95f8a25c97b..7867095de85 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsController.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsController.java @@ -37,6 +37,7 @@ import com.android.settingslib.RestrictedPreference; import com.android.settingslib.Utils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.mobile.dataservice.DataServiceUtils; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.mobile.dataservice.UiccInfoEntity; @@ -97,7 +98,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl @Override public CharSequence getSummary() { List list = getSubscriptionInfoList(); - if (list == null || list .isEmpty()) { + if (list == null || list.isEmpty()) { return setSummaryResId(R.string.calls_sms_no_sim); } else { final StringBuilder summary = new StringBuilder(); @@ -223,10 +224,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl @Override public void onActiveSubInfoChanged(List activeSubInfoList) { - if ((mSubInfoEntityList != null && - (activeSubInfoList.isEmpty() || !activeSubInfoList.equals(mSubInfoEntityList))) - || (!activeSubInfoList.isEmpty() && mSubInfoEntityList == null)) { - Log.d(TAG, "subInfo list from framework is changed, update the subInfo entity list."); + if (DataServiceUtils.shouldUpdateEntityList(mSubInfoEntityList, activeSubInfoList)) { mSubInfoEntityList = activeSubInfoList; update(); } diff --git a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java index b2cf74e0a82..ab247f1a87c 100644 --- a/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java +++ b/src/com/android/settings/network/NetworkProviderCallsSmsFragment.java @@ -57,8 +57,10 @@ public class NetworkProviderCallsSmsFragment extends DashboardFragment { @Override protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); - controllers.add(new CallsDefaultSubscriptionController(context, KEY_PREFERENCE_CALLS)); - controllers.add(new SmsDefaultSubscriptionController(context, KEY_PREFERENCE_SMS)); + controllers.add(new CallsDefaultSubscriptionController(context, KEY_PREFERENCE_CALLS, + getSettingsLifecycle(), this)); + controllers.add(new SmsDefaultSubscriptionController(context, KEY_PREFERENCE_SMS, + getSettingsLifecycle(), this)); mNetworkProviderWifiCallingPreferenceController = new NetworkProviderWifiCallingPreferenceController(context, KEY_PREFERENCE_CATEGORY_CALLING); diff --git a/src/com/android/settings/network/NetworkProviderSimListController.java b/src/com/android/settings/network/NetworkProviderSimListController.java index 478d97b2132..66b2d92a1fe 100644 --- a/src/com/android/settings/network/NetworkProviderSimListController.java +++ b/src/com/android/settings/network/NetworkProviderSimListController.java @@ -41,6 +41,7 @@ import com.android.settings.network.telephony.MobileNetworkUtils; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.LifecycleObserver; +import com.android.settingslib.mobile.dataservice.DataServiceUtils; import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import com.android.settingslib.mobile.dataservice.UiccInfoEntity; @@ -177,10 +178,7 @@ public class NetworkProviderSimListController extends AbstractPreferenceControll @Override public void onAvailableSubInfoChanged(List subInfoEntityList) { - if ((mSubInfoEntityList != null && - (subInfoEntityList.isEmpty() || !subInfoEntityList.equals(mSubInfoEntityList))) - || (!subInfoEntityList.isEmpty() && mSubInfoEntityList == null)) { - Log.d(TAG, "subInfo list from framework is changed, update the subInfo entity list."); + if (DataServiceUtils.shouldUpdateEntityList(mSubInfoEntityList, subInfoEntityList)) { mSubInfoEntityList = subInfoEntityList; mPreferenceCategory.setVisible(isAvailable()); update(); diff --git a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java index b8e29118c05..de45e626014 100644 --- a/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/CallsDefaultSubscriptionController.java @@ -17,25 +17,36 @@ package com.android.settings.network.telephony; import android.content.Context; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import com.android.settings.Utils; +import androidx.lifecycle.LifecycleOwner; + +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; public class CallsDefaultSubscriptionController extends DefaultSubscriptionController { - public CallsDefaultSubscriptionController(Context context, String preferenceKey) { - super(context, preferenceKey); + private SubscriptionInfoEntity mSubscriptionInfoEntity; + + public CallsDefaultSubscriptionController(Context context, String preferenceKey, + Lifecycle lifecycle, LifecycleOwner lifecycleOwner) { + super(context, preferenceKey, lifecycle, lifecycleOwner); } @Override - protected SubscriptionInfo getDefaultSubscriptionInfo() { - return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId()); + protected SubscriptionInfoEntity getDefaultSubscriptionInfo() { + return mSubscriptionInfoEntity; } @Override protected int getDefaultSubscriptionId() { - return SubscriptionManager.getDefaultVoiceSubscriptionId(); + for (SubscriptionInfoEntity subInfo : mSubInfoEntityList) { + if (subInfo.isActiveSubscriptionId && subInfo.isDefaultVoiceSubscription) { + mSubscriptionInfoEntity = subInfo; + return Integer.parseInt(subInfo.subId); + } + } + return SubscriptionManager.INVALID_SUBSCRIPTION_ID; } @Override @@ -45,6 +56,7 @@ public class CallsDefaultSubscriptionController extends DefaultSubscriptionContr @Override public CharSequence getSummary() { - return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, true); + return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, true, + mSubInfoEntityList); } } diff --git a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java index 342b5793853..6eab13232e1 100644 --- a/src/com/android/settings/network/telephony/DefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/DefaultSubscriptionController.java @@ -24,11 +24,11 @@ import android.content.Context; import android.telecom.PhoneAccount; import android.telecom.PhoneAccountHandle; import android.telecom.TelecomManager; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.view.View; import androidx.lifecycle.LifecycleObserver; +import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.OnLifecycleEvent; import androidx.preference.ListPreference; import androidx.preference.Preference; @@ -36,8 +36,12 @@ import androidx.preference.PreferenceScreen; import com.android.internal.annotations.VisibleForTesting; import com.android.settings.R; -import com.android.settings.network.SubscriptionUtil; -import com.android.settings.network.SubscriptionsChangeListener; +import com.android.settings.network.MobileNetworkRepository; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.mobile.dataservice.DataServiceUtils; +import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity; +import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; +import com.android.settingslib.mobile.dataservice.UiccInfoEntity; import java.util.ArrayList; import java.util.List; @@ -49,13 +53,14 @@ import java.util.List; */ public abstract class DefaultSubscriptionController extends TelephonyBasePreferenceController implements LifecycleObserver, Preference.OnPreferenceChangeListener, - SubscriptionsChangeListener.SubscriptionsChangeListenerClient { + MobileNetworkRepository.MobileNetworkCallback { private static final String TAG = "DefaultSubController"; - protected SubscriptionsChangeListener mChangeListener; protected ListPreference mPreference; protected SubscriptionManager mManager; protected TelecomManager mTelecomManager; + protected MobileNetworkRepository mMobileNetworkRepository; + protected LifecycleOwner mLifecycleOwner; private static final String EMERGENCY_ACCOUNT_HANDLE_ID = "E"; private static final ComponentName PSTN_CONNECTION_SERVICE_COMPONENT = @@ -63,17 +68,24 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere "com.android.services.telephony.TelephonyConnectionService"); private boolean mIsRtlMode; - public DefaultSubscriptionController(Context context, String preferenceKey) { + List mSubInfoEntityList = new ArrayList<>(); + + public DefaultSubscriptionController(Context context, String preferenceKey, Lifecycle lifecycle, + LifecycleOwner lifecycleOwner) { super(context, preferenceKey); mManager = context.getSystemService(SubscriptionManager.class); - mChangeListener = new SubscriptionsChangeListener(context, this); mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection() == View.LAYOUT_DIRECTION_RTL; + mMobileNetworkRepository = MobileNetworkRepository.create(context, this); + mLifecycleOwner = lifecycleOwner; + if (lifecycle != null) { + lifecycle.addObserver(this); + } } /** @return SubscriptionInfo for the default subscription for the service, or null if there * isn't one. */ - protected abstract SubscriptionInfo getDefaultSubscriptionInfo(); + protected abstract SubscriptionInfoEntity getDefaultSubscriptionInfo(); /** @return the id of the default subscription for the service, or * SubscriptionManager.INVALID_SUBSCRIPTION_ID if there isn't one. */ @@ -93,13 +105,13 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere @OnLifecycleEvent(ON_RESUME) public void onResume() { - mChangeListener.start(); + mMobileNetworkRepository.addRegister(mLifecycleOwner); updateEntries(); } @OnLifecycleEvent(ON_PAUSE) public void onPause() { - mChangeListener.stop(); + mMobileNetworkRepository.removeRegister(); } @Override @@ -126,10 +138,10 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere // display VoIP account in summary when configured through settings within dialer return getLabelFromCallingAccount(handle); } - final SubscriptionInfo info = getDefaultSubscriptionInfo(); + final SubscriptionInfoEntity info = getDefaultSubscriptionInfo(); if (info != null) { // display subscription based account - return SubscriptionUtil.getUniqueSubscriptionDisplayName(info, mContext); + return info.uniqueName; } else { if (isAskEverytimeSupported()) { return mContext.getString(R.string.calls_and_sms_ask_every_time); @@ -139,7 +151,8 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere } } - private void updateEntries() { + @VisibleForTesting + void updateEntries() { if (mPreference == null) { return; } @@ -154,30 +167,28 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere // getAvailabilityStatus returned CONDITIONALLY_UNAVAILABLE at the time. mPreference.setOnPreferenceChangeListener(this); - final List subs = SubscriptionUtil.getActiveSubscriptions(mManager); - // We'll have one entry for each available subscription, plus one for a "ask me every // time" entry at the end. final ArrayList displayNames = new ArrayList<>(); final ArrayList subscriptionIds = new ArrayList<>(); + List list = getSubscriptionInfoList(); - if (subs.size() == 1) { + if (list.size() == 1) { mPreference.setEnabled(false); - mPreference.setSummaryProvider(pref -> - SubscriptionUtil.getUniqueSubscriptionDisplayName(subs.get(0), mContext)); + mPreference.setSummaryProvider(pref -> list.get(0).uniqueName); return; } final int serviceDefaultSubId = getDefaultSubscriptionId(); boolean subIsAvailable = false; - for (SubscriptionInfo sub : subs) { - if (sub.isOpportunistic()) { + for (SubscriptionInfoEntity sub : list) { + if (sub.isOpportunistic) { continue; } - displayNames.add(SubscriptionUtil.getUniqueSubscriptionDisplayName(sub, mContext)); - final int subId = sub.getSubscriptionId(); - subscriptionIds.add(Integer.toString(subId)); + displayNames.add(sub.uniqueName); + final int subId = Integer.parseInt(sub.subId); + subscriptionIds.add(sub.subId); if (subId == serviceDefaultSubId) { subIsAvailable = true; } @@ -270,6 +281,11 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere return (label != null) ? label : ""; } + @VisibleForTesting + protected List getSubscriptionInfoList() { + return mSubInfoEntityList; + } + @Override public boolean onPreferenceChange(Preference preference, Object newValue) { final int subscriptionId = Integer.parseInt((String) newValue); @@ -282,15 +298,29 @@ public abstract class DefaultSubscriptionController extends TelephonyBasePrefere public void onAirplaneModeChanged(boolean airplaneModeEnabled) { } + boolean isRtlMode() { + return mIsRtlMode; + } + @Override - public void onSubscriptionsChanged() { - if (mPreference != null) { + public void onAvailableSubInfoChanged(List subInfoEntityList) { + } + + @Override + public void onActiveSubInfoChanged(List subInfoEntityList) { + if (DataServiceUtils.shouldUpdateEntityList(mSubInfoEntityList, subInfoEntityList)) { + mSubInfoEntityList = subInfoEntityList; updateEntries(); refreshSummary(mPreference); } } - boolean isRtlMode() { - return mIsRtlMode; + @Override + public void onAllUiccInfoChanged(List uiccInfoEntityList) { + } + + @Override + public void onAllMobileNetworkInfoChanged( + List mobileNetworkInfoEntityList) { } } diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 97ba8b8b7de..ae83c43c5bc 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -77,6 +77,8 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme static final String KEY_CLICKED_PREF = "key_clicked_pref"; private static final String KEY_ROAMING_PREF = "button_roaming_key"; + private static final String KEY_CALLS_PREF = "calls_preference"; + private static final String KEY_SMS_PREF = "sms_preference"; //String keys for preference lookup private static final String BUTTON_CDMA_SYSTEM_SELECT_KEY = "cdma_system_select_key"; @@ -169,7 +171,11 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings impleme new DataUsageSummaryPreferenceController(getActivity(), getSettingsLifecycle(), this, mSubId), new RoamingPreferenceController(context, KEY_ROAMING_PREF, getSettingsLifecycle(), - this, mSubId)); + this, mSubId), + new CallsDefaultSubscriptionController(context, KEY_CALLS_PREF, + getSettingsLifecycle(), this), + new SmsDefaultSubscriptionController(context, KEY_SMS_PREF, getSettingsLifecycle(), + this)); } @Override diff --git a/src/com/android/settings/network/telephony/MobileNetworkUtils.java b/src/com/android/settings/network/telephony/MobileNetworkUtils.java index a526e3f363c..599fa6b1077 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkUtils.java +++ b/src/com/android/settings/network/telephony/MobileNetworkUtils.java @@ -945,19 +945,15 @@ public class MobileNetworkUtils { * Returns preferred status of Calls & SMS separately when Provider Model is enabled. */ public static CharSequence getPreferredStatus(boolean isRtlMode, Context context, - SubscriptionManager subscriptionManager, boolean isPreferredCallStatus) { - final List subs = SubscriptionUtil.getActiveSubscriptions( - subscriptionManager); - if (!subs.isEmpty()) { + boolean isPreferredCallStatus, List entityList) { + if (entityList != null || !entityList.isEmpty()) { final StringBuilder summary = new StringBuilder(); - for (SubscriptionInfo subInfo : subs) { - int subsSize = subs.size(); - final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName( - subInfo, context); + for (SubscriptionInfoEntity subInfo : entityList) { + int subsSize = entityList.size(); + final CharSequence displayName = subInfo.uniqueName; // Set displayName as summary if there is only one valid SIM. - if (subsSize == 1 - && SubscriptionManager.isValidSubscriptionId(subInfo.getSubscriptionId())) { + if (subsSize == 1 && subInfo.isValidSubscription) { return displayName; } @@ -975,7 +971,7 @@ public class MobileNetworkUtils { .append(")"); } // Do not add ", " for the last subscription. - if (subInfo != subs.get(subs.size() - 1)) { + if (subInfo != entityList.get(entityList.size() - 1)) { summary.append(", "); } @@ -989,24 +985,20 @@ public class MobileNetworkUtils { } } - private static CharSequence getPreferredCallStatus(Context context, SubscriptionInfo subInfo) { - final int subId = subInfo.getSubscriptionId(); + private static CharSequence getPreferredCallStatus(Context context, + SubscriptionInfoEntity subInfo) { String status = ""; - boolean isDataPreferred = subId == SubscriptionManager.getDefaultVoiceSubscriptionId(); - - if (isDataPreferred) { + if (subInfo.isDefaultVoiceSubscription) { status = setSummaryResId(context, R.string.calls_sms_preferred); } return status; } - private static CharSequence getPreferredSmsStatus(Context context, SubscriptionInfo subInfo) { - final int subId = subInfo.getSubscriptionId(); + private static CharSequence getPreferredSmsStatus(Context context, + SubscriptionInfoEntity subInfo) { String status = ""; - boolean isSmsPreferred = subId == SubscriptionManager.getDefaultSmsSubscriptionId(); - - if (isSmsPreferred) { + if (subInfo.isDefaultSmsSubscription) { status = setSummaryResId(context, R.string.calls_sms_preferred); } @@ -1041,7 +1033,7 @@ public class MobileNetworkUtils { public static void launchMobileNetworkSettings(Context context, SubscriptionInfoEntity info) { final int subId = Integer.valueOf(info.subId); - if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) { + if (!info.isValidSubscription) { Log.d(TAG, "launchMobileNetworkSettings fail, subId is invalid."); return; } diff --git a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java index 68ebe84c7b1..fddd3581926 100644 --- a/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java +++ b/src/com/android/settings/network/telephony/SmsDefaultSubscriptionController.java @@ -18,29 +18,39 @@ package com.android.settings.network.telephony; import android.content.Context; import android.telecom.PhoneAccountHandle; -import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; -import com.android.settings.Utils; +import androidx.lifecycle.LifecycleOwner; + +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; public class SmsDefaultSubscriptionController extends DefaultSubscriptionController { private final boolean mIsAskEverytimeSupported; + private SubscriptionInfoEntity mSubscriptionInfoEntity; - public SmsDefaultSubscriptionController(Context context, String preferenceKey) { - super(context, preferenceKey); + public SmsDefaultSubscriptionController(Context context, String preferenceKey, + Lifecycle lifecycle, LifecycleOwner lifecycleOwner) { + super(context, preferenceKey, lifecycle, lifecycleOwner); mIsAskEverytimeSupported = mContext.getResources() .getBoolean(com.android.internal.R.bool.config_sms_ask_every_time_support); } @Override - protected SubscriptionInfo getDefaultSubscriptionInfo() { - return mManager.getActiveSubscriptionInfo(getDefaultSubscriptionId()); + protected SubscriptionInfoEntity getDefaultSubscriptionInfo() { + return mSubscriptionInfoEntity; } @Override protected int getDefaultSubscriptionId() { - return SubscriptionManager.getDefaultSmsSubscriptionId(); + for (SubscriptionInfoEntity subInfo : mSubInfoEntityList) { + if (subInfo.isActiveSubscriptionId && subInfo.isDefaultSmsSubscription) { + mSubscriptionInfoEntity = subInfo; + return Integer.parseInt(subInfo.subId); + } + } + return SubscriptionManager.INVALID_SUBSCRIPTION_ID; } @Override @@ -61,6 +71,7 @@ public class SmsDefaultSubscriptionController extends DefaultSubscriptionControl @Override public CharSequence getSummary() { - return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, mManager, false); + return MobileNetworkUtils.getPreferredStatus(isRtlMode(), mContext, false, + mSubInfoEntityList); } } diff --git a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java index 57e38d3b20d..ffc9f9b81b9 100644 --- a/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/DefaultSubscriptionControllerTest.java @@ -16,6 +16,8 @@ package com.android.settings.network.telephony; +import static androidx.lifecycle.Lifecycle.Event; + import static com.android.settings.core.BasePreferenceController.AVAILABLE; import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; @@ -32,15 +34,21 @@ import android.os.Looper; import android.telecom.TelecomManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; +import android.telephony.TelephonyManager; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LifecycleRegistry; import androidx.preference.ListPreference; import androidx.preference.PreferenceManager; import androidx.preference.PreferenceScreen; +import androidx.test.annotation.UiThreadTest; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; import com.android.settings.network.SubscriptionUtil; import com.android.settings.testutils.ResourcesUtils; +import com.android.settingslib.core.lifecycle.Lifecycle; +import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity; import org.junit.After; import org.junit.Before; @@ -50,39 +58,74 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import java.util.ArrayList; import java.util.Arrays; +import java.util.List; @RunWith(AndroidJUnit4.class) public class DefaultSubscriptionControllerTest { + + private static final String SUB_ID_1 = "1"; + private static final String SUB_ID_2 = "2"; + private static final String SUB_ID_3 = "3"; + 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; @Mock private TelecomManager mTelecomManager; + @Mock + private Lifecycle mLifecycle; + @Mock + private LifecycleOwner mLifecycleOwner; + @Mock + private SubscriptionInfoEntity mSubInfo1; + @Mock + private SubscriptionInfoEntity mSubInfo2; + @Mock + private SubscriptionInfoEntity mSubInfo3; + private LifecycleRegistry mLifecycleRegistry; private PreferenceScreen mScreen; private PreferenceManager mPreferenceManager; private ListPreference mListPreference; private Context mContext; - private DefaultSubscriptionController mController; + private TestDefaultSubscriptionController mController; + private List mSubscriptionInfoEntityList = new ArrayList<>(); @Before public void setUp() { MockitoAnnotations.initMocks(this); + + if (Looper.myLooper() == null) { + Looper.prepare(); + } + mContext = spy(ApplicationProvider.getApplicationContext()); when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubMgr); when(mContext.getSystemService(TelecomManager.class)).thenReturn(mTelecomManager); final String key = "prefkey"; - mController = new TestDefaultSubscriptionController(mContext, key); - - if (Looper.myLooper() == null) { - Looper.prepare(); - } + mController = new TestDefaultSubscriptionController(mContext, key, mLifecycle, + mLifecycleOwner); mPreferenceManager = new PreferenceManager(mContext); mScreen = mPreferenceManager.createPreferenceScreen(mContext); mListPreference = new ListPreference(mContext); mListPreference.setKey(key); mScreen.addPreference(mListPreference); + mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner); + when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry); } @After @@ -90,6 +133,19 @@ public class DefaultSubscriptionControllerTest { SubscriptionUtil.setActiveSubscriptionsForTesting(null); } + 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, + boolean isDefaultCall, boolean isDefaultSms) { + 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, "default", false, isValid, + true, isActive, isAvailable, isDefaultCall, + isDefaultSms, false, false, false); + } + @Test public void getAvailabilityStatus_twoSubscriptions_isAvailable() { SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList( @@ -105,113 +161,16 @@ public class DefaultSubscriptionControllerTest { mController.isCallingAccountBindToSubscription(null); } - @Test - public void getLabelFromCallingAccount_invalidAccount_emptyString() { - doReturn(null).when(mTelecomManager).getPhoneAccount(any()); - - assertThat(mController.getLabelFromCallingAccount(null)).isEqualTo(""); - } - - @Ignore - @Test - public void displayPreference_twoSubscriptionsSub1Default_correctListPreferenceValues() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); - - mController.displayPreference(mScreen); - - final CharSequence entry = mListPreference.getEntry(); - final String value = mListPreference.getValue(); - assertThat(entry).isEqualTo("sub1"); - assertThat(value).isEqualTo("111"); - - final CharSequence[] entries = mListPreference.getEntries(); - assertThat(entries.length).isEqualTo(3); - assertThat(entries[0]).isEqualTo("sub1"); - assertThat(entries[1]).isEqualTo("sub2"); - assertThat(entries[2]).isEqualTo( - ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time")); - - final CharSequence[] entryValues = mListPreference.getEntryValues(); - assertThat(entryValues.length).isEqualTo(3); - assertThat(entryValues[0]).isEqualTo("111"); - assertThat(entryValues[1]).isEqualTo("222"); - assertThat(entryValues[2]).isEqualTo( - Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); - } - - @Ignore - @Test - public void displayPreference_twoSubscriptionsSub2Default_correctListPreferenceValues() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub2.getSubscriptionId()); - - mController.displayPreference(mScreen); - - final CharSequence entry = mListPreference.getEntry(); - final String value = mListPreference.getValue(); - assertThat(entry).isEqualTo("sub2"); - assertThat(value).isEqualTo("222"); - - final CharSequence[] entries = mListPreference.getEntries(); - assertThat(entries.length).isEqualTo(3); - assertThat(entries[0]).isEqualTo("sub1"); - assertThat(entries[1]).isEqualTo("sub2"); - assertThat(entries[2]).isEqualTo( - ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time")); - - final CharSequence[] entryValues = mListPreference.getEntryValues(); - assertThat(entryValues.length).isEqualTo(3); - assertThat(entryValues[0]).isEqualTo("111"); - assertThat(entryValues[1]).isEqualTo("222"); - assertThat(entryValues[2]).isEqualTo( - Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); - } - - @Ignore - @Test - public void displayPreference_threeSubsOneIsOpportunistic_correctListPreferenceValues() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - final SubscriptionInfo sub3 = createMockSub(333, "sub3"); - - // Mark sub2 as opportunistic; then it should not appear in the list of entries/entryValues. - when(sub2.isOpportunistic()).thenReturn(true); - - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn( - Arrays.asList(sub1, sub2, sub3)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); - - mController.displayPreference(mScreen); - - final CharSequence[] entries = mListPreference.getEntries(); - assertThat(entries.length).isEqualTo(3); - assertThat(entries[0]).isEqualTo("sub1"); - assertThat(entries[1]).isEqualTo("sub3"); - assertThat(entries[2]).isEqualTo( - ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time")); - - final CharSequence[] entryValues = mListPreference.getEntryValues(); - assertThat(entryValues.length).isEqualTo(3); - assertThat(entryValues[0]).isEqualTo("111"); - assertThat(entryValues[1]).isEqualTo("333"); - assertThat(entryValues[2]).isEqualTo( - Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); - } - @Test public void onPreferenceChange_prefChangedToSub2_callbackCalledCorrectly() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mSubscriptionInfoEntityList.add(mSubInfo1); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); mController.displayPreference(mScreen); mListPreference.setValue("222"); @@ -221,10 +180,14 @@ public class DefaultSubscriptionControllerTest { @Test public void onPreferenceChange_prefChangedToAlwaysAsk_callbackCalledCorrectly() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mSubscriptionInfoEntityList.add(mSubInfo1); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); mController.displayPreference(mScreen); mListPreference.setValue(Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); @@ -236,61 +199,70 @@ public class DefaultSubscriptionControllerTest { @Test public void onPreferenceChange_prefBecomesAvailable_onPreferenceChangeCallbackNotNull() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - // Start with only one sub active, so the pref is not available - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); - + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mSubscriptionInfoEntityList.add(mSubInfo1); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); mController.displayPreference(mScreen); assertThat(mController.isAvailable()).isTrue(); // Now make two subs be active - the pref should become available, and the // onPreferenceChange callback should be properly wired up. - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - - mController.onSubscriptionsChanged(); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); assertThat(mController.isAvailable()).isTrue(); - mListPreference.callChangeListener("222"); - assertThat(mController.getDefaultSubscriptionId()).isEqualTo(222); + mListPreference.callChangeListener(SUB_ID_2); + assertThat(mController.getDefaultSubscriptionId()).isEqualTo(2); } @Ignore @Test public void onSubscriptionsChanged_twoSubscriptionsDefaultChanges_selectedEntryGetsUpdated() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mSubscriptionInfoEntityList.add(mSubInfo1); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); mController.displayPreference(mScreen); - assertThat(mListPreference.getEntry()).isEqualTo("sub1"); - assertThat(mListPreference.getValue()).isEqualTo("111"); + assertThat(mListPreference.getEntry()).isEqualTo(DISPLAY_NAME_1); + assertThat(mListPreference.getValue()).isEqualTo(SUB_ID_1); - mController.setDefaultSubscription(sub2.getSubscriptionId()); - mController.onSubscriptionsChanged(); - assertThat(mListPreference.getEntry()).isEqualTo("sub2"); - assertThat(mListPreference.getValue()).isEqualTo("222"); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo2.subId)); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); + assertThat(mListPreference.getEntry()).isEqualTo(DISPLAY_NAME_2); + assertThat(mListPreference.getValue()).isEqualTo(mSubInfo2); } @Test public void onSubscriptionsChanged_goFromTwoSubscriptionsToOne_prefDisappears() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mSubscriptionInfoEntityList.add(mSubInfo1); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); + mController.displayPreference(mScreen); mController.displayPreference(mScreen); assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); assertThat(mListPreference.isEnabled()).isTrue(); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1)); - mController.onSubscriptionsChanged(); + mSubscriptionInfoEntityList.remove(mSubInfo2); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); @@ -298,21 +270,23 @@ public class DefaultSubscriptionControllerTest { } @Test + @UiThreadTest public void onSubscriptionsChanged_goFromOneSubscriptionToTwo_prefAppears() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); - + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mSubscriptionInfoEntityList.add(mSubInfo1); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); mController.displayPreference(mScreen); assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); assertThat(mListPreference.isEnabled()).isFalse(); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2)); - mController.onSubscriptionsChanged(); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.setSubscriptionInfoList(mSubscriptionInfoEntityList); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); @@ -322,34 +296,36 @@ public class DefaultSubscriptionControllerTest { @Ignore @Test public void onSubscriptionsChanged_goFromTwoToThreeSubscriptions_listGetsUpdated() { - final SubscriptionInfo sub1 = createMockSub(111, "sub1"); - final SubscriptionInfo sub2 = createMockSub(222, "sub2"); - final SubscriptionInfo sub3 = createMockSub(333, "sub3"); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn(Arrays.asList(sub1, sub2)); - mController.setDefaultSubscription(sub1.getSubscriptionId()); + mSubInfo1 = 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); + mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2, + SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false); + mSubInfo3 = setupSubscriptionInfoEntity(SUB_ID_3, 1, 1, DISPLAY_NAME_3, SUB_MCC_3, + SUB_MNC_3, SUB_COUNTRY_ISO_3, 1, true, true, true, false, false); + mController.setDefaultSubscription(Integer.parseInt(mSubInfo1.subId)); + mSubscriptionInfoEntityList.add(mSubInfo1); + mSubscriptionInfoEntityList.add(mSubInfo2); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); mController.displayPreference(mScreen); assertThat(mListPreference.getEntries().length).isEqualTo(3); - SubscriptionUtil.setActiveSubscriptionsForTesting(Arrays.asList(sub1, sub2, sub3)); - when(mSubMgr.getAvailableSubscriptionInfoList()).thenReturn( - Arrays.asList(sub1, sub2, sub3)); - mController.onSubscriptionsChanged(); + mSubscriptionInfoEntityList.add(mSubInfo3); + mController.onActiveSubInfoChanged(mSubscriptionInfoEntityList); assertThat(mController.isAvailable()).isTrue(); assertThat(mListPreference.isVisible()).isTrue(); final CharSequence[] entries = mListPreference.getEntries(); final CharSequence[] entryValues = mListPreference.getEntryValues(); assertThat(entries.length).isEqualTo(4); - assertThat(entries[0].toString()).isEqualTo("sub1"); - assertThat(entries[1].toString()).isEqualTo("sub2"); - assertThat(entries[2].toString()).isEqualTo("sub3"); + assertThat(entries[0].toString()).isEqualTo(DISPLAY_NAME_1); + assertThat(entries[1].toString()).isEqualTo(DISPLAY_NAME_2); + assertThat(entries[2].toString()).isEqualTo(DISPLAY_NAME_3); assertThat(entries[3].toString()).isEqualTo( ResourcesUtils.getResourcesString(mContext, "calls_and_sms_ask_every_time")); - assertThat(entryValues[0].toString()).isEqualTo("111"); - assertThat(entryValues[1].toString()).isEqualTo("222"); - assertThat(entryValues[2].toString()).isEqualTo("333"); + assertThat(entryValues[0].toString()).isEqualTo(SUB_ID_1); + assertThat(entryValues[1].toString()).isEqualTo(SUB_ID_2); + assertThat(entryValues[2].toString()).isEqualTo(SUB_ID_3); assertThat(entryValues[3].toString()).isEqualTo( Integer.toString(SubscriptionManager.INVALID_SUBSCRIPTION_ID)); } @@ -363,13 +339,15 @@ public class DefaultSubscriptionControllerTest { private class TestDefaultSubscriptionController extends DefaultSubscriptionController { int mSubId = SubscriptionManager.INVALID_SUBSCRIPTION_ID; + private List mSubscriptionInfoEntity; - TestDefaultSubscriptionController(Context context, String preferenceKey) { - super(context, preferenceKey); + TestDefaultSubscriptionController(Context context, String preferenceKey, + Lifecycle lifecycle, LifecycleOwner lifecycleOwner) { + super(context, preferenceKey, lifecycle, lifecycleOwner); } @Override - protected SubscriptionInfo getDefaultSubscriptionInfo() { + protected SubscriptionInfoEntity getDefaultSubscriptionInfo() { return null; } @@ -382,5 +360,14 @@ public class DefaultSubscriptionControllerTest { protected void setDefaultSubscription(int subscriptionId) { mSubId = subscriptionId; } + + @Override + protected List getSubscriptionInfoList() { + return mSubscriptionInfoEntity; + } + + public void setSubscriptionInfoList(List list) { + mSubscriptionInfoEntity = list; + } } }