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

Commit 83acf8ef authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Settings] Refactor MobileNetworkUtils"

parents bb899b82 3148dd89

src/com/android/settings/network/telephony/MobileNetworkUtils.java

+6 −3
Original line number Diff line number Diff line
@@ -509,12 +509,15 @@ public class MobileNetworkUtils { 
        if (carrierConfig.getBoolean(CarrierConfigManager.KEY_SUPPORT_TDSCDMA_BOOL)) {

            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 String operatorNumeric =

                (serviceState != null) ? serviceState.getOperatorNumeric() : null;

        final String[] numericArray = carrierConfig.getStringArray(

                CarrierConfigManager.KEY_SUPPORT_TDSCDMA_ROAMING_NETWORKS_STRING_ARRAY);

        if (numericArray == null || operatorNumeric == null) {

        if (operatorNumeric == null) {

            return false;

        }

        for (String numeric : numericArray) {