BasebandVersionDialogController: Trim duplicated baseband if needed

Change-Id: Ife1cf4982672e7f5f3c631d80cdeac6350585938

2 files changed, 32 insertions, 2 deletions

diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandFormatter.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandFormatter.java
new file mode 100644
index 0000000000..9dca245d5f
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandFormatter.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2019 The PixelExperience Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.deviceinfo.firmwareversion;
+
+public class BasebandFormatter {
+    public static String getFormattedBaseband(String baseband){
+        if (baseband.contains(",")) {
+            String[] splitBaseband = baseband.split(",");
+            if (splitBaseband.length > 1 && splitBaseband[0].equals(splitBaseband[1])) {
+                baseband = splitBaseband[0];
+            }
+        }
+        return baseband;
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
index 1507ddc80b..bb0a8454e4 100644
--- a/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/firmwareversion/BasebandVersionPreferenceController.java
@@ -53,7 +53,8 @@ public class BasebandVersionPreferenceController extends BasePreferenceControlle
                 }
             }
         }
-        return SystemProperties.get(BASEBAND_PROPERTY,
-                mContext.getString(R.string.device_info_default));
+        return BasebandFormatter.getFormattedBaseband(
+                SystemProperties.get(BASEBAND_PROPERTY,
+                mContext.getString(R.string.device_info_default)));
     }
 }