Merge "Return "" not "null"" am: eebbd2b639

am: edaf4401e1

Change-Id: Id4c2bf04e877664188c8fab2905601d6f431cfde

core/java/android/os/Build.java

@@ -1125,7 +1125,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) {