PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Change the way in NetworkProviderCallsSmsController for getting the subscription info from room db part2"

Browse Source
This commit is contained in:
Zoey Chen
2022-10-19 04:29:21 +00:00
committed by Android (Google) Code Review
parent b036cfabd6 605754eff3
commit ced43b33f2
3 changed files with 151 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -121,7 +121,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(internetPreferenceController); controllers.add(internetPreferenceController);
} }
controllers.add(privateDnsPreferenceController); controllers.add(privateDnsPreferenceController);
controllers.add(new NetworkProviderCallsSmsController(context, lifecycle)); controllers.add(new NetworkProviderCallsSmsController(context, lifecycle, lifecycleOwner));
return controllers; return controllers;
} }

98
src/com/android/settings/network/NetworkProviderCallsSmsController.java
View File

@@ -21,13 +21,13 @@ import static androidx.lifecycle.Lifecycle.Event;
import android.content.Context; import android.content.Context;
import android.os.UserManager; import android.os.UserManager;
import android.telephony.ServiceState; import android.telephony.ServiceState;
import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
import android.util.Log;
import android.view.View; import android.view.View;
import androidx.annotation.VisibleForTesting; import androidx.annotation.VisibleForTesting;
import androidx.lifecycle.LifecycleObserver; import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.OnLifecycleEvent; import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.Preference; import androidx.preference.Preference;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
@@ -37,50 +37,55 @@ import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.mobile.dataservice.MobileNetworkInfoEntity;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import com.android.settingslib.mobile.dataservice.UiccInfoEntity;
import java.util.List; import java.util.List;
public class NetworkProviderCallsSmsController extends AbstractPreferenceController implements public class NetworkProviderCallsSmsController extends AbstractPreferenceController implements
SubscriptionsChangeListener.SubscriptionsChangeListenerClient, LifecycleObserver { LifecycleObserver, MobileNetworkRepository.MobileNetworkCallback {
private static final String TAG = "NetworkProviderCallsSmsController"; private static final String TAG = "NetworkProviderCallsSmsController";
private static final String KEY = "calls_and_sms"; private static final String KEY = "calls_and_sms";
private static final String RTL_MARK = "\u200F"; private static final String RTL_MARK = "\u200F";
private UserManager mUserManager; private UserManager mUserManager;
private SubscriptionManager mSubscriptionManager;
private SubscriptionsChangeListener mSubscriptionsChangeListener;
private TelephonyManager mTelephonyManager; private TelephonyManager mTelephonyManager;
private RestrictedPreference mPreference; private RestrictedPreference mPreference;
private boolean mIsRtlMode; private boolean mIsRtlMode;
private LifecycleOwner mLifecycleOwner;
private MobileNetworkRepository mMobileNetworkRepository;
private List<SubscriptionInfoEntity> mSubInfoEntityList;
/** /**
* The summary text and click behavior of the "Calls & SMS" item on the * The summary text and click behavior of the "Calls & SMS" item on the
* Network & internet page. * Network & internet page.
*/ */
public NetworkProviderCallsSmsController(Context context, Lifecycle lifecycle) { public NetworkProviderCallsSmsController(Context context, Lifecycle lifecycle,
LifecycleOwner lifecycleOwner) {
super(context); super(context);
mUserManager = context.getSystemService(UserManager.class); mUserManager = context.getSystemService(UserManager.class);
mSubscriptionManager = context.getSystemService(SubscriptionManager.class);
mTelephonyManager = mContext.getSystemService(TelephonyManager.class); mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection() mIsRtlMode = context.getResources().getConfiguration().getLayoutDirection()
== View.LAYOUT_DIRECTION_RTL; == View.LAYOUT_DIRECTION_RTL;
mLifecycleOwner = lifecycleOwner;
mMobileNetworkRepository = new MobileNetworkRepository(context, this);
if (lifecycle != null) { if (lifecycle != null) {
mSubscriptionsChangeListener = new SubscriptionsChangeListener(context, this);
lifecycle.addObserver(this); lifecycle.addObserver(this);
} }
} }
@OnLifecycleEvent(Event.ON_RESUME) @OnLifecycleEvent(Event.ON_RESUME)
public void onResume() { public void onResume() {
mSubscriptionsChangeListener.start(); mMobileNetworkRepository.addRegister(mLifecycleOwner);
update(); update();
} }
@OnLifecycleEvent(Event.ON_PAUSE) @OnLifecycleEvent(Event.ON_PAUSE)
public void onPause() { public void onPause() {
mSubscriptionsChangeListener.stop(); mMobileNetworkRepository.removeRegister();
} }
@Override @Override
@@ -91,27 +96,24 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions( List<SubscriptionInfoEntity> list = getSubscriptionInfoList();
mSubscriptionManager); if (list == null || list .isEmpty()) {
if (subs.isEmpty()) {
return setSummaryResId(R.string.calls_sms_no_sim); return setSummaryResId(R.string.calls_sms_no_sim);
} else { } else {
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();
for (SubscriptionInfo subInfo : subs) { for (SubscriptionInfoEntity subInfo : list) {
int subsSize = subs.size(); int subsSize = list.size();
int subId = subInfo.getSubscriptionId(); int subId = Integer.parseInt(subInfo.subId);
final CharSequence displayName = SubscriptionUtil.getUniqueSubscriptionDisplayName( final CharSequence displayName = subInfo.uniqueName;
subInfo, mContext);
// Set displayName as summary if there is only one valid SIM. // Set displayName as summary if there is only one valid SIM.
if (subsSize == 1 if (subsSize == 1
&& SubscriptionManager.isValidSubscriptionId(subId) && list.get(0).isValidSubscription
&& isInService(subId)) { && isInService(subId)) {
return displayName; return displayName;
} }
CharSequence status = getPreferredStatus(subsSize, subId); CharSequence status = getPreferredStatus(subInfo, subsSize, subId);
if (status.toString().isEmpty()) { if (status.toString().isEmpty()) {
// If there are 2 or more SIMs and one of these has no preferred status, // If there are 2 or more SIMs and one of these has no preferred status,
// set only its displayName as summary. // set only its displayName as summary.
@@ -123,7 +125,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
.append(")"); .append(")");
} }
// Do not add ", " for the last subscription. // Do not add ", " for the last subscription.
if (subInfo != subs.get(subs.size() - 1)) { if (!subInfo.equals(list.get(list.size() - 1))) {
summary.append(", "); summary.append(", ");
} }
@@ -136,12 +138,13 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
} }
@VisibleForTesting @VisibleForTesting
protected CharSequence getPreferredStatus(int subsSize, int subId) { protected CharSequence getPreferredStatus(SubscriptionInfoEntity subInfo, int subsSize,
int subId) {
String status = ""; String status = "";
boolean isDataPreferred = subId == getDefaultVoiceSubscriptionId(); boolean isDataPreferred = subInfo.isDefaultVoiceSubscription;
boolean isSmsPreferred = subId == getDefaultSmsSubscriptionId(); boolean isSmsPreferred = subInfo.isDefaultSmsSubscription;
if (!SubscriptionManager.isValidSubscriptionId(subId) || !isInService(subId)) { if (!subInfo.isValidSubscription || !isInService(subId)) {
status = setSummaryResId(subsSize > 1 ? R.string.calls_sms_unavailable : status = setSummaryResId(subsSize > 1 ? R.string.calls_sms_unavailable :
R.string.calls_sms_temp_unavailable); R.string.calls_sms_temp_unavailable);
} else { } else {
@@ -161,13 +164,8 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
} }
@VisibleForTesting @VisibleForTesting
protected int getDefaultVoiceSubscriptionId() { protected List<SubscriptionInfoEntity> getSubscriptionInfoList() {
return SubscriptionManager.getDefaultVoiceSubscriptionId(); return mSubInfoEntityList;
}
@VisibleForTesting
protected int getDefaultSmsSubscriptionId() {
return SubscriptionManager.getDefaultSmsSubscriptionId();
} }
private void update() { private void update() {
@@ -178,9 +176,7 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
mPreference.setOnPreferenceClickListener(null); mPreference.setOnPreferenceClickListener(null);
mPreference.setFragment(null); mPreference.setFragment(null);
final List<SubscriptionInfo> subs = SubscriptionUtil.getActiveSubscriptions( if (mSubInfoEntityList == null || mSubInfoEntityList.isEmpty()) {
mSubscriptionManager);
if (subs.isEmpty()) {
mPreference.setEnabled(false); mPreference.setEnabled(false);
} else { } else {
mPreference.setEnabled(true); mPreference.setEnabled(true);
@@ -213,16 +209,34 @@ public class NetworkProviderCallsSmsController extends AbstractPreferenceControl
update(); update();
} }
@Override
public void onSubscriptionsChanged() {
refreshSummary(mPreference);
update();
}
@VisibleForTesting @VisibleForTesting
protected boolean isInService(int subId) { protected boolean isInService(int subId) {
ServiceState serviceState = ServiceState serviceState =
mTelephonyManager.createForSubscriptionId(subId).getServiceState(); mTelephonyManager.createForSubscriptionId(subId).getServiceState();
return Utils.isInService(serviceState); return Utils.isInService(serviceState);
} }
@Override
public void onAvailableSubInfoChanged(List<SubscriptionInfoEntity> subInfoEntityList) {
}
@Override
public void onActiveSubInfoChanged(List<SubscriptionInfoEntity> 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.");
mSubInfoEntityList = activeSubInfoList;
update();
}
}
@Override
public void onAllUiccInfoChanged(List<UiccInfoEntity> uiccInfoEntityList) {
}
@Override
public void onAllMobileNetworkInfoChanged(
List<MobileNetworkInfoEntity> mobileNetworkInfoEntityList) {
}
} }

187
tests/unit/src/com/android/settings/network/NetworkProviderCallsSmsControllerTest.java
View File

@@ -21,7 +21,6 @@ import static androidx.lifecycle.Lifecycle.Event;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy; import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -29,6 +28,7 @@ import android.content.Context;
import android.os.Looper; import android.os.Looper;
import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionInfo;
import android.telephony.SubscriptionManager; import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.text.TextUtils; import android.text.TextUtils;
import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleOwner;
@@ -42,6 +42,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
import com.android.settings.testutils.ResourcesUtils; import com.android.settings.testutils.ResourcesUtils;
import com.android.settingslib.RestrictedPreference; import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.mobile.dataservice.SubscriptionInfoEntity;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -50,58 +51,63 @@ import org.mockito.Mock;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.List;
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class NetworkProviderCallsSmsControllerTest { public class NetworkProviderCallsSmsControllerTest {
private static final int SUB_ID_1 = 1; private static final String SUB_ID_1 = "1";
private static final int SUB_ID_2 = 2; private static final String SUB_ID_2 = "2";
private static final String INVALID_SUB_ID = "-1";
private static final String KEY_PREFERENCE_CALLS_SMS = "calls_and_sms"; private static final String KEY_PREFERENCE_CALLS_SMS = "calls_and_sms";
private static final String DISPLAY_NAME_1 = "Sub 1"; private static final String DISPLAY_NAME_1 = "Sub 1";
private static final String DISPLAY_NAME_2 = "Sub 2"; 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 @Mock
private SubscriptionManager mSubscriptionManager; private SubscriptionInfoEntity mSubInfo1;
@Mock @Mock
private SubscriptionInfo mSubscriptionInfo1; private SubscriptionInfoEntity mSubInfo2;
@Mock
private SubscriptionInfo mSubscriptionInfo2;
@Mock @Mock
private Lifecycle mLifecycle; private Lifecycle mLifecycle;
@Mock @Mock
private LifecycleOwner mLifecycleOwner; private LifecycleOwner mLifecycleOwner;
private LifecycleRegistry mLifecycleRegistry;
private LifecycleRegistry mLifecycleRegistry;
private MockNetworkProviderCallsSmsController mController; private MockNetworkProviderCallsSmsController mController;
private PreferenceManager mPreferenceManager; private PreferenceManager mPreferenceManager;
private PreferenceScreen mPreferenceScreen; private PreferenceScreen mPreferenceScreen;
private RestrictedPreference mPreference; private RestrictedPreference mPreference;
private Context mContext; private Context mContext;
private List<SubscriptionInfoEntity> mSubscriptionInfoEntityList = new ArrayList<>();
/** /**
* Mock the NetworkProviderCallsSmsController that allows allows one to set a default voice * Mock the NetworkProviderCallsSmsController that allows one to set a default voice
* and SMS subscription ID. * and SMS subscription ID.
*/ */
private class MockNetworkProviderCallsSmsController extends private class MockNetworkProviderCallsSmsController extends
com.android.settings.network.NetworkProviderCallsSmsController { com.android.settings.network.NetworkProviderCallsSmsController {
public MockNetworkProviderCallsSmsController(Context context, Lifecycle lifecycle) { public MockNetworkProviderCallsSmsController(Context context, Lifecycle lifecycle,
super(context, lifecycle); LifecycleOwner lifecycleOwner) {
super(context, lifecycle, lifecycleOwner);
} }
private int mDefaultVoiceSubscriptionId; private List<SubscriptionInfoEntity> mSubscriptionInfoEntity;
private int mDefaultSmsSubscriptionId;
private boolean mIsInService; private boolean mIsInService;
@Override
protected int getDefaultVoiceSubscriptionId() {
return mDefaultVoiceSubscriptionId;
}
@Override @Override
protected int getDefaultSmsSubscriptionId() { protected List<SubscriptionInfoEntity> getSubscriptionInfoList() {
return mDefaultSmsSubscriptionId; return mSubscriptionInfoEntity;
}
public void setSubscriptionInfoList(List<SubscriptionInfoEntity> list) {
mSubscriptionInfoEntity = list;
} }
@Override @Override
@@ -109,14 +115,6 @@ public class NetworkProviderCallsSmsControllerTest {
return mIsInService; return mIsInService;
} }
public void setDefaultVoiceSubscriptionId(int subscriptionId) {
mDefaultVoiceSubscriptionId = subscriptionId;
}
public void setDefaultSmsSubscriptionId(int subscriptionId) {
mDefaultSmsSubscriptionId = subscriptionId;
}
public void setInService(boolean inService) { public void setInService(boolean inService) {
mIsInService = inService; mIsInService = inService;
} }
@@ -126,7 +124,6 @@ public class NetworkProviderCallsSmsControllerTest {
public void setUp() { public void setUp() {
MockitoAnnotations.initMocks(this); MockitoAnnotations.initMocks(this);
mContext = spy(ApplicationProvider.getApplicationContext()); mContext = spy(ApplicationProvider.getApplicationContext());
when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
if (Looper.myLooper() == null) { if (Looper.myLooper() == null) {
Looper.prepare(); Looper.prepare();
@@ -136,7 +133,8 @@ public class NetworkProviderCallsSmsControllerTest {
mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext);
mPreference = new RestrictedPreference(mContext); mPreference = new RestrictedPreference(mContext);
mPreference.setKey(KEY_PREFERENCE_CALLS_SMS); mPreference.setKey(KEY_PREFERENCE_CALLS_SMS);
mController = new MockNetworkProviderCallsSmsController(mContext, mLifecycle); mController = new MockNetworkProviderCallsSmsController(mContext, mLifecycle,
mLifecycleOwner);
mController.setInService(true); mController.setInService(true);
mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner); mLifecycleRegistry = new LifecycleRegistry(mLifecycleOwner);
when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry); when(mLifecycleOwner.getLifecycle()).thenReturn(mLifecycleRegistry);
@@ -149,13 +147,6 @@ public class NetworkProviderCallsSmsControllerTest {
mLifecycleRegistry.handleLifecycleEvent(Event.ON_RESUME); mLifecycleRegistry.handleLifecycleEvent(Event.ON_RESUME);
} }
private void setupSubscriptionInfoList(int subId, String displayName,
SubscriptionInfo subscriptionInfo) {
when(subscriptionInfo.getSubscriptionId()).thenReturn(subId);
doReturn(subscriptionInfo).when(mSubscriptionManager).getActiveSubscriptionInfo(subId);
when(subscriptionInfo.getDisplayName()).thenReturn(displayName);
}
private String setSummaryResId(String resName) { private String setSummaryResId(String resName) {
return ResourcesUtils.getResourcesString(mContext, resName); return ResourcesUtils.getResourcesString(mContext, resName);
} }
@@ -163,23 +154,36 @@ public class NetworkProviderCallsSmsControllerTest {
@Test @Test
@UiThreadTest @UiThreadTest
public void getSummary_noSim_returnNoSim() { public void getSummary_noSim_returnNoSim() {
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(new ArrayList<>()); mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(new ArrayList<>());
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
assertTrue(TextUtils.equals(mController.getSummary(), assertTrue(TextUtils.equals(mController.getSummary(),
setSummaryResId("calls_sms_no_sim"))); setSummaryResId("calls_sms_no_sim")));
} }
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);
}
@Test @Test
@UiThreadTest @UiThreadTest
public void getSummary_invalidSubId_returnUnavailable() { public void getSummary_invalidSubId_returnUnavailable() {
setupSubscriptionInfoList(SubscriptionManager.INVALID_SUBSCRIPTION_ID, DISPLAY_NAME_1,
mSubscriptionInfo1); mSubInfo1 = setupSubscriptionInfoEntity(INVALID_SUB_ID,
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( SubscriptionManager.INVALID_SIM_SLOT_INDEX, TelephonyManager.UNKNOWN_CARRIER_ID,
Arrays.asList(mSubscriptionInfo1)); DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1, SUB_COUNTRY_ISO_1,
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn( TelephonyManager.UNINITIALIZED_CARD_ID, false, true, true, false, false);
Arrays.asList(mSubscriptionInfo1)); mSubscriptionInfoEntityList.add(mSubInfo1);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();
@@ -194,13 +198,16 @@ public class NetworkProviderCallsSmsControllerTest {
@Test @Test
@UiThreadTest @UiThreadTest
public void getSummary_oneIsInvalidSubIdTwoIsValidSubId_returnOneIsUnavailable() { public void getSummary_oneIsInvalidSubIdTwoIsValidSubId_returnOneIsUnavailable() {
setupSubscriptionInfoList(SubscriptionManager.INVALID_SUBSCRIPTION_ID, DISPLAY_NAME_1,
mSubscriptionInfo1); mSubInfo1 = setupSubscriptionInfoEntity(INVALID_SUB_ID,
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2); SubscriptionManager.INVALID_SIM_SLOT_INDEX, TelephonyManager.UNKNOWN_CARRIER_ID,
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( DISPLAY_NAME_1, SUB_MCC_1, SUB_MNC_1, SUB_COUNTRY_ISO_1,
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); TelephonyManager.UNINITIALIZED_CARD_ID, false, true, true, false, false);
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn( mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false);
mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();
@@ -214,16 +221,14 @@ public class NetworkProviderCallsSmsControllerTest {
assertTrue(TextUtils.equals(mController.getSummary(), summary)); assertTrue(TextUtils.equals(mController.getSummary(), summary));
} }
@Test @Test
@UiThreadTest @UiThreadTest
public void getSummary_oneSubscription_returnDisplayName() { public void getSummary_oneSubscription_returnDisplayName() {
setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
Arrays.asList(mSubscriptionInfo1)); SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true, false, false);
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn( mSubscriptionInfoEntityList.add(mSubInfo1);
Arrays.asList(mSubscriptionInfo1)); mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
assertThat(mPreference.getSummary()).isEqualTo(DISPLAY_NAME_1); assertThat(mPreference.getSummary()).isEqualTo(DISPLAY_NAME_1);
@@ -232,12 +237,14 @@ public class NetworkProviderCallsSmsControllerTest {
@Test @Test
@UiThreadTest @UiThreadTest
public void getSummary_allSubscriptionsHaveNoPreferredStatus_returnDisplayName() { public void getSummary_allSubscriptionsHaveNoPreferredStatus_returnDisplayName() {
setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1);
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2); mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true, false, false);
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn( SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false);
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); mSubscriptionInfoEntityList.add(mSubInfo1);
mSubscriptionInfoEntityList.add(mSubInfo2);
mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();
@@ -250,15 +257,13 @@ public class NetworkProviderCallsSmsControllerTest {
@UiThreadTest @UiThreadTest
public void getSummary_oneSubscriptionsIsCallPreferredTwoIsSmsPreferred_returnStatus() { public void getSummary_oneSubscriptionsIsCallPreferredTwoIsSmsPreferred_returnStatus() {
mController.setDefaultVoiceSubscriptionId(SUB_ID_1); mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
mController.setDefaultSmsSubscriptionId(SUB_ID_2); SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true, true, false);
mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,
setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1); SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, true);
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2); mSubscriptionInfoEntityList.add(mSubInfo1);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( mSubscriptionInfoEntityList.add(mSubInfo2);
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();
@@ -279,15 +284,13 @@ public class NetworkProviderCallsSmsControllerTest {
@UiThreadTest @UiThreadTest
public void getSummary_oneSubscriptionsIsSmsPreferredTwoIsCallPreferred_returnStatus() { public void getSummary_oneSubscriptionsIsSmsPreferredTwoIsCallPreferred_returnStatus() {
mController.setDefaultVoiceSubscriptionId(SUB_ID_2); mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
mController.setDefaultSmsSubscriptionId(SUB_ID_1); SUB_MNC_1, SUB_COUNTRY_ISO_1, 1, true, true, true, false, true);
mSubInfo2 = setupSubscriptionInfoEntity(SUB_ID_2, 1, 1, DISPLAY_NAME_2, SUB_MCC_2,
setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1); SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, true, false);
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2); mSubscriptionInfoEntityList.add(mSubInfo1);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( mSubscriptionInfoEntityList.add(mSubInfo2);
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();
@@ -308,15 +311,13 @@ public class NetworkProviderCallsSmsControllerTest {
@UiThreadTest @UiThreadTest
public void getSummary_oneSubscriptionsIsSmsPreferredAndIsCallPreferred_returnStatus() { public void getSummary_oneSubscriptionsIsSmsPreferredAndIsCallPreferred_returnStatus() {
mController.setDefaultVoiceSubscriptionId(SUB_ID_1); mSubInfo1 = setupSubscriptionInfoEntity(SUB_ID_1, 1, 1, DISPLAY_NAME_1, SUB_MCC_1,
mController.setDefaultSmsSubscriptionId(SUB_ID_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,
setupSubscriptionInfoList(SUB_ID_1, DISPLAY_NAME_1, mSubscriptionInfo1); SUB_MNC_2, SUB_COUNTRY_ISO_2, 1, true, true, true, false, false);
setupSubscriptionInfoList(SUB_ID_2, DISPLAY_NAME_2, mSubscriptionInfo2); mSubscriptionInfoEntityList.add(mSubInfo1);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn( mSubscriptionInfoEntityList.add(mSubInfo2);
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2)); mController.setSubscriptionInfoList(mSubscriptionInfoEntityList);
when(mSubscriptionManager.getAvailableSubscriptionInfoList()).thenReturn(
Arrays.asList(mSubscriptionInfo1, mSubscriptionInfo2));
displayPreferenceWithLifecycle(); displayPreferenceWithLifecycle();
final StringBuilder summary = new StringBuilder(); final StringBuilder summary = new StringBuilder();