diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java index f3f330f1e9c..b6a136d43b2 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java @@ -43,14 +43,15 @@ public class BasebandVersionPreferenceController extends BasePreferenceControlle @Override public CharSequence getSummary() { - String baseband = SystemProperties.get(BASEBAND_PROPERTY, + String baseBands = SystemProperties.get(BASEBAND_PROPERTY, mContext.getString(R.string.device_info_default)); - for (String str : baseband.split(",")) { - if (!TextUtils.isEmpty(str)) { - return str; + if (null != baseBands) { + String[] baseBandArray = baseBands.split(","); + if ((baseBandArray != null) && (baseBandArray.length > 0)) { + return baseBandArray[0]; } } - return baseband; + return baseBands; } } // LINT.ThenChange(BasebandVersionPreference.kt)