Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix String is empty issue"

Browse Source 
am: 80af1ba47b

Change-Id: I7000d0fe8fd5c2145e628abec11b49653027138b
This commit is contained in:
pengzhicai
2016-11-02 18:23:26 +00:00
committed by android-build-merger
parent def235760e 80af1ba47b
commit 38c585cb8d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -1165,7 +1165,7 @@ public class TelephonyManager {
private int getPhoneTypeFromProperty(int phoneId) { private int getPhoneTypeFromProperty(int phoneId) {
String type = getTelephonyProperty(phoneId, String type = getTelephonyProperty(phoneId,
TelephonyProperties.CURRENT_ACTIVE_PHONE, null); TelephonyProperties.CURRENT_ACTIVE_PHONE, null);
if (type == null || type.equals("")) { if (type == null || type.isEmpty()) {
return getPhoneTypeFromNetworkType(phoneId); return getPhoneTypeFromNetworkType(phoneId);
} }
return Integer.parseInt(type); return Integer.parseInt(type);
@@ -1181,7 +1181,7 @@ public class TelephonyManager {
// use the system property for default network type. // use the system property for default network type.
// This is a fail safe, and can only happen at first boot. // This is a fail safe, and can only happen at first boot.
String mode = getTelephonyProperty(phoneId, "ro.telephony.default_network", null); 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.getPhoneType(Integer.parseInt(mode));
} }
return TelephonyManager.PHONE_TYPE_NONE; return TelephonyManager.PHONE_TYPE_NONE;