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

Commit 80af1ba4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix String is empty issue"

parents cf4dc923 7c30bb8e

telephony/java/android/telephony/TelephonyManager.java

+2 −2
Original line number Diff line number Diff line
@@ -1118,7 +1118,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);
@@ -1134,7 +1134,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;