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

Commit f85e7930 authored by pengzhicai's avatar pengzhicai Committed by android-build-merger
Browse files

Merge "Fix String is empty issue" am: 80af1ba4 am: 38c585cb 

am: d7df704d

Change-Id: Ia75039c87b396b8b0d15f0758d17e365fb2f18e6
parents 1d35eee4 d7df704d

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1165,7 +1165,7 @@ public class TelephonyManager { 
    private int getPhoneTypeFromProperty(int phoneId) {

        String type = getTelephonyProperty(phoneId,

                TelephonyProperties.CURRENT_ACTIVE_PHONE, null);

        if (type == null || type.equals("")) {

        if (type == null || type.isEmpty()) {

            return getPhoneTypeFromNetworkType(phoneId);

        }

        return Integer.parseInt(type);
@@ -1181,7 +1181,7 @@ public class TelephonyManager { 
        // use the system property for default network type.

        // This is a fail safe, and can only happen at first boot.

        String mode = getTelephonyProperty(phoneId, "ro.telephony.default_network", null);

        if (mode != null) {

        if (mode != null && !mode.isEmpty()) {

            return TelephonyManager.getPhoneType(Integer.parseInt(mode));

        }

        return TelephonyManager.PHONE_TYPE_NONE;