Merge "Return "" not "null""

This commit is contained in:
Jordan Liu
2018-12-11 01:12:38 +00:00
committed by Gerrit Code Review

3
core/java/android/os/Build.java Normal file → Executable file
View File

@@ -1113,7 +1113,8 @@ public class Build {
* null (if, for instance, the radio is not currently on). * null (if, for instance, the radio is not currently on).
*/ */
public static String getRadioVersion() { 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) { private static String getString(String property) {