From d4151ebc0db217d67b411b446ffbefdf8dad6d35 Mon Sep 17 00:00:00 2001 From: Jordan Liu Date: Tue, 4 Sep 2018 16:31:38 -0700 Subject: getTelephonyProperty returns defaultVal getTelephonyProperty needs to return defaultVal, which it currently doesn't because SystemProperties.get doesn't return null, it returns empty-string. Change-Id: Ida06d3c4ce46a9e988ca7a2b0677293fb6a932eb Fixes: 113796156 Test: atest FrameworksTelephonyTests --- telephony/java/android/telephony/TelephonyManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2e0bc6cb9f1a..9fb6c473e49a 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -58,6 +58,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; @@ -5301,7 +5302,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 */ -- cgit v1.2.3-59-g8ed1b