Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 524d6685 authored by Jordan Liu's avatar Jordan Liu Committed by android-build-merger
Browse files

Merge "getTelephonyProperty returns defaultVal" am: bb9f855f am: ca854cc2 

am: c3f2df9d

Change-Id: I66da4d1ff190243205f89c2d4e08b4506df4a40d
parents 06ee120b c3f2df9d

telephony/java/android/telephony/TelephonyManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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;
@@ -5402,7 +5403,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 */