diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-11 20:30:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-11 20:30:17 +0000 |
| commit | bb9f855faafac9449a93de3eb8162454c04fd276 (patch) | |
| tree | a907490d55f4676d137330b5b1689321ff4a6823 | |
| parent | 5674805cda4820bd2ad8df3b30ab5e7d00153c3e (diff) | |
| parent | d4151ebc0db217d67b411b446ffbefdf8dad6d35 (diff) | |
| download | base-bb9f855faafac9449a93de3eb8162454c04fd276.tar.gz | |
Merge "getTelephonyProperty returns defaultVal"
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 13cdc58175e3..2d156b08c6d3 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -60,6 +60,7 @@ import android.telephony.ims.aidl.IImsMmTelFeature; import android.telephony.ims.aidl.IImsRcsFeature; import android.telephony.ims.aidl.IImsRegistration; import android.telephony.ims.stub.ImsRegistrationImplBase; +import android.text.TextUtils; import android.util.Log; import com.android.ims.internal.IImsServiceFeatureCallback; @@ -5381,7 +5382,7 @@ public class TelephonyManager { @UnsupportedAppUsage public static String getTelephonyProperty(String property, String defaultVal) { String propVal = SystemProperties.get(property); - return propVal == null ? defaultVal : propVal; + return TextUtils.isEmpty(propVal) ? defaultVal : propVal; } /** @hide */ |