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
This commit is contained in:
Jordan Liu
2018-09-04 16:31:38 -07:00
parent 7fe46504be
commit d4151ebc0d

View File

@@ -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 */