diff options
| author | Jordan Liu <jminjie@google.com> | 2018-12-10 17:44:53 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-12-10 17:44:53 -0800 |
| commit | ec098703ef3ccf009e3fee08e258ab77870f69f4 (patch) | |
| tree | a979dbc7488355f649d5005db231097b8ab8b3e9 /core/java/android | |
| parent | f7e816f6a25fc5b393c11fc875b66a74857bd0c6 (diff) | |
| parent | edaf4401e1e1c0cbb5182a28d825f040f6e99ac8 (diff) | |
Merge "Return "" not "null"" am: eebbd2b639
am: edaf4401e1
Change-Id: Id4c2bf04e877664188c8fab2905601d6f431cfde
Diffstat (limited to 'core/java/android')
| -rwxr-xr-x[-rw-r--r--] | core/java/android/os/Build.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 724af4b85015..af5236dd9a2e 100644..100755 --- a/core/java/android/os/Build.java +++ b/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) { |