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

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
2 changed files with 11 additions and 1 deletions

View File

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