From 7c30bb8e0f80c86e6c282d3d6d5671c61d6e4f99 Mon Sep 17 00:00:00 2001 From: pengzhicai Date: Wed, 2 Nov 2016 09:27:20 +0800 Subject: [PATCH] Fix String is empty issue Maybe the string is empty https://code.google.com/p/android/issues/detail?id=226739 Change-Id: I645ae05a8cbe316e29d9710de0bbba64c0c2275d Signed-off-by: pengzhicai --- telephony/java/android/telephony/TelephonyManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 4dab2bb0ff279..79130e4b16ec1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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;