PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[Settings] Refactor MobileNetworkUtils"

Browse Source
This commit is contained in:
TreeHugger Robot
2021-10-25 12:46:39 +00:00
committed by Android (Google) Code Review
parent bb899b82a5 3148dd89fe
commit 83acf8efac
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/network/telephony/MobileNetworkUtils.java
View File

@@ -509,12 +509,15 @@ public class MobileNetworkUtils {
if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL)) { if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL)) {
return true; return true;
} }
final String[] numericArray = carrierConfig.getStringArray(
CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY);
if (numericArray == null) {
return false;
}
final ServiceState serviceState = telephonyManager.getServiceState(); final ServiceState serviceState = telephonyManager.getServiceState();
final String operatorNumeric = final String operatorNumeric =
(serviceState != null) ? serviceState.getOperatorNumeric() : null; (serviceState != null) ? serviceState.getOperatorNumeric() : null;
final String[] numericArray = carrierConfig.getStringArray( if (operatorNumeric == null) {
CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY);
if (numericArray == null || operatorNumeric == null) {
return false; return false;
} }
for (String numeric : numericArray) { for (String numeric : numericArray) {