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

Merge "Fix Settings crashing while displaying phone number slice." into qt-dev am: 3da9f727e3 am: 69893f95ae

Browse Source 
am: 09dbc29187

Change-Id: I94a03587188d833536b13627776ba9c44af77492
This commit is contained in:
Stanley Wang
2019-05-24 06:48:04 -07:00
committed by android-build-merger
parent 55c78bec0b 09dbc29187
commit 69f6d559b0
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/deviceinfo/PhoneNumberPreferenceController.java
View File

@@ -120,7 +120,7 @@ public class PhoneNumberPreferenceController extends BasePreferenceController {
private CharSequence getFirstPhoneNumber() { private CharSequence getFirstPhoneNumber() {
final List<SubscriptionInfo> subscriptionInfoList = final List<SubscriptionInfo> subscriptionInfoList =
mSubscriptionManager.getActiveSubscriptionInfoList(true); mSubscriptionManager.getActiveSubscriptionInfoList(true);
if (subscriptionInfoList == null) { if (subscriptionInfoList == null || subscriptionInfoList.isEmpty()) {
return mContext.getText(R.string.device_info_default); return mContext.getText(R.string.device_info_default);
} }

10
tests/robotests/src/com/android/settings/deviceinfo/PhoneNumberPreferenceControllerTest.java
View File

@@ -149,6 +149,16 @@ public class PhoneNumberPreferenceControllerTest {
assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default)); assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default));
} }
@Test
public void getSummary_getEmptySubscriptionInfo_shouldShowUnknown() {
List<SubscriptionInfo> infos = new ArrayList<>();
when(mSubscriptionManager.getActiveSubscriptionInfoList(eq(true))).thenReturn(infos);
CharSequence primaryNumber = mController.getSummary();
assertThat(primaryNumber).isEqualTo(mContext.getString(R.string.device_info_default));
}
@Test @Test
public void isSliceable_shouldBeTrue() { public void isSliceable_shouldBeTrue() {
assertThat(mController.isSliceable()).isTrue(); assertThat(mController.isSliceable()).isTrue();