From e1b61b66ce61d543e04f5ef313c15d25976b05bb Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Fri, 24 Apr 2020 22:22:47 +0100 Subject: [PATCH] BasebandVersionPreferenceController: Trim baseband if needed Some Qualcomm MSIM devices report the baseband version twice. Handle it gracefully, similarly to CAF. Change-Id: I93bd071f31fed120c20185c4e0ec40edb7ca342b --- .../BasebandVersionPreferenceController.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java index 235638433be..f3f330f1e9c 100644 --- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java +++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java @@ -18,6 +18,7 @@ package com.android.settings.deviceinfo.firmwareversion; import android.content.Context; import android.os.SystemProperties; +import android.text.TextUtils; import androidx.annotation.VisibleForTesting; @@ -42,8 +43,14 @@ public class BasebandVersionPreferenceController extends BasePreferenceControlle @Override public CharSequence getSummary() { - return SystemProperties.get(BASEBAND_PROPERTY, + String baseband = SystemProperties.get(BASEBAND_PROPERTY, mContext.getString(R.string.device_info_default)); + for (String str : baseband.split(",")) { + if (!TextUtils.isEmpty(str)) { + return str; + } + } + return baseband; } } // LINT.ThenChange(BasebandVersionPreference.kt)