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

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

Merge "[Settings] Refactor MobileNetworkUtils"

parents 074c3657 51a1245d

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

+8 −7
Original line number Diff line number Diff line
@@ -355,21 +355,22 @@ public class MobileNetworkUtils { 
        if (subId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {

            return false;

        }

        final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)

                .createForSubscriptionId(subId);



        final PersistableBundle carrierConfig = context.getSystemService(

                CarrierConfigManager.class).getConfigForSubId(subId);





        if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {

            return true;

        } else if (carrierConfig != null

        if (carrierConfig != null

                && !carrierConfig.getBoolean(

                CarrierConfigManager.KEY_HIDE_CARRIER_NETWORK_SETTINGS_BOOL)

                && carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL)) {

            return true;

        }



        final TelephonyManager telephonyManager = context.getSystemService(TelephonyManager.class)

                .createForSubscriptionId(subId);

        if (telephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {

            return true;

        }



        if (isWorldMode(context, subId)) {

            final int settingsNetworkMode = getNetworkTypeFromRaf(

                    (int) telephonyManager.getAllowedNetworkTypesForReason(