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

Merge "SubscriptionUtil checks that SubscriptionInfo is null before accessing." into sc-dev

Browse Source
This commit is contained in:
Jeremy Goldman
2021-02-01 08:16:42 +00:00
committed by Android (Google) Code Review
parent b1b0f450e7 3dd2878437
commit ba8f1ad06f
2 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/network/SubscriptionUtil.java
View File

@@ -338,6 +338,9 @@ public class SubscriptionUtil {
@VisibleForTesting
public static CharSequence getUniqueSubscriptionDisplayName(
SubscriptionInfo info, Context context) {
if (info == null) {
return "";
}
return getUniqueSubscriptionDisplayName(info.getSubscriptionId(), context);
}

20
tests/unit/src/com/android/settings/network/SubscriptionUtilTest.java
View File

@@ -380,6 +380,26 @@ public class SubscriptionUtilTest {
assertEquals(CARRIER_1, name);
}
@Test
public void getUniqueDisplayName_nullSubscriptionInfo_emptyStringReturned() {
final SubscriptionInfo info1 = mock(SubscriptionInfo.class);
when(info1.getSubscriptionId()).thenReturn(SUBID_1);
when(info1.getDisplayName()).thenReturn(CARRIER_1);
when(mSubMgr.getActiveSubscriptionInfoList()).thenReturn(
Arrays.asList(info1));
TelephonyManager sub1Telmgr = mock(TelephonyManager.class);
when(sub1Telmgr.getLine1Number()).thenReturn("1112223333");
when(mTelMgr.createForSubscriptionId(SUBID_1)).thenReturn(sub1Telmgr);
SubscriptionInfo info2 = null;
final CharSequence name =
SubscriptionUtil.getUniqueSubscriptionDisplayName(info2, mContext);
assertThat(name).isNotNull();
assertTrue(TextUtils.isEmpty(name));
}
@Test
public void isInactiveInsertedPSim_nullSubInfo_doesNotCrash() {
assertThat(SubscriptionUtil.isInactiveInsertedPSim(null)).isFalse();