Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "getTelephonyProperty returns defaultVal" am: bb9f855faa

Browse Source 
am: ca854cc2b9

Change-Id: I6774ef18f185f35344bef3bf42ab5addf23ea03a
This commit is contained in:
Jordan Liu
2018-10-11 14:12:55 -07:00
committed by android-build-merger
parent 5101473303 ca854cc2b9
commit c3f2df9d6b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
telephony/java/android/telephony/TelephonyManager.java
View File

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