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

SubscriptionsPreferenceController shows the unique sim description.

Browse Source 
Bug: 148303118
Bug: 150370656
Test: atest -c SubscriptionsPreferenceControllerTest
Change-Id: I041536fe0148087a068c6000383b382b0ff4e17c
This commit is contained in:
Jeremy Goldman
2021-01-15 16:32:07 +08:00
parent 8e2ecd5918
commit 9d87cd9126
33 changed files with 153 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/unit/src/com/android/settings/network/ProviderModelSliceHelperTest.java
View File

@@ -61,10 +61,13 @@ 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 ProviderModelSliceHelperTest {
private static final int DEFAULT_SUBID = 1;
private Context mContext;
private MockProviderModelSliceHelper mProviderModelSliceHelper;
private PersistableBundle mBundle;
@@ -168,10 +171,15 @@ public class ProviderModelSliceHelperTest {
String expectDisplayName = "Name1";
String expectedSubtitle = "5G";
String networkType = "5G";
int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
mDefaultDataSubscriptionInfo);
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mDefaultDataSubscriptionInfo));
when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_WIFI);
@@ -194,10 +202,13 @@ public class ProviderModelSliceHelperTest {
String expectedSubtitle = ResourcesUtils.getResourcesString(mContext,
"preference_summary_default_combination", connectedText, networkType);
int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
final int defaultDataSubId = SubscriptionManager.getDefaultDataSubscriptionId();
when(mDefaultDataSubscriptionInfo.getSubscriptionId()).thenReturn(defaultDataSubId);
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mSubscriptionManager.getActiveSubscriptionInfo(defaultDataSubId)).thenReturn(
mDefaultDataSubscriptionInfo);
when(mDefaultDataSubscriptionInfo.getDisplayName()).thenReturn(expectDisplayName);
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(mDefaultDataSubscriptionInfo));
when(mServiceState.getState()).thenReturn(ServiceState.STATE_IN_SERVICE);
mBundle.putBoolean(CarrierConfigManager.KEY_INFLATE_SIGNAL_STRENGTH_BOOL, false);
addNetworkTransportType(NetworkCapabilities.TRANSPORT_CELLULAR);