From 3e40de9cb741208692a283e1fd31c945d4b9d21e Mon Sep 17 00:00:00 2001 From: Adithya R Date: Thu, 16 Jan 2020 21:27:09 +0530 Subject: [PATCH] Settings: Fix duplicated baseband string on all devices. * CAF has fixed this year-old glitch but it seems like only a certain "CT PA" requires it and hence the code is guarded (check 4bb2825836dd5099447508d3cb321952e1f7a5fa and a7162edd8e811a1918f66769111f8cbda3a993fe) * Let's make the fix available for all dual SIM devices! Change-Id: Icfc1e54047a0ecc4b52999c798d2e6a580309e46 (cherry picked from commit d7876e1cc4c2284a2b6c167169b0279367fc76f6) Signed-off-by: Dmitrii --- .../BasebandVersionPreferenceController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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)