diff options
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 987b1d16808d..d75dd7d1f6f1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1193,7 +1193,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); @@ -1209,7 +1209,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; |