From 73273e0caab896232b4b8a75641d64f3ac06c04a Mon Sep 17 00:00:00 2001 From: Seongho Kim Date: Fri, 16 Nov 2018 13:44:48 +0900 Subject: [PATCH] Return "" not "null" Some models such as LDU, WIFI do not have "gsm.version.baseband", which should return "null" when it is called. However it returns "" not "null" Bug: 120685535 Test: Self-Test Change-Id: Idc1363d45a0ece3a35f46da287e21015ac1387af --- core/java/android/os/Build.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100644 => 100755 core/java/android/os/Build.java diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java old mode 100644 new mode 100755 index 91888949829f8..6932aa70267e8 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -1113,7 +1113,8 @@ public class Build { * null (if, for instance, the radio is not currently on). */ public static String getRadioVersion() { - return SystemProperties.get(TelephonyProperties.PROPERTY_BASEBAND_VERSION, null); + String propVal = SystemProperties.get(TelephonyProperties.PROPERTY_BASEBAND_VERSION); + return TextUtils.isEmpty(propVal) ? null : propVal; } private static String getString(String property) {