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

Commit 5d4b2877 authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Adds ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G to Phone.java" am: 1b3b09e8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1642001

Change-Id: I1fb26b793e1fe1aed91a01bbe80835c584d333ec
parents 14b3375d 1b3b09e8

src/java/com/android/internal/telephony/Phone.java

+7 −1
Original line number Diff line number Diff line
@@ -446,6 +446,7 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
    private static final String ALLOWED_NETWORK_TYPES_TEXT_USER = "user";

    private static final String ALLOWED_NETWORK_TYPES_TEXT_POWER = "power";

    private static final String ALLOWED_NETWORK_TYPES_TEXT_CARRIER = "carrier";

    private static final String ALLOWED_NETWORK_TYPES_TEXT_ENABLE_2G = "enable_2g";

    private static final int INVALID_ALLOWED_NETWORK_TYPES = -1;



    private boolean mUnitTestMode;
@@ -2225,7 +2226,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
        List<Integer> listOfAllowedNetworkTypesForReasons = new ArrayList<>(

                Arrays.asList(TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_USER,

                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_POWER,

                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER));

                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER,

                        TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G));

        Map<Integer, Long> allowedNetworkTypeList = new HashMap<>();

        for (Integer reasonItem : listOfAllowedNetworkTypesForReasons) {

            allowedNetworkTypeList.put(reasonItem, getAllowedNetworkTypes(reasonItem));
@@ -2334,6 +2336,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                return TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_POWER;

            case ALLOWED_NETWORK_TYPES_TEXT_CARRIER:

                return TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER;

            case ALLOWED_NETWORK_TYPES_TEXT_ENABLE_2G:

                return TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G;

            default:

                return INVALID_ALLOWED_NETWORK_TYPES;

        }
@@ -2347,6 +2351,8 @@ public abstract class Phone extends Handler implements PhoneInternalInterface { 
                return ALLOWED_NETWORK_TYPES_TEXT_POWER;

            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_CARRIER:

                return ALLOWED_NETWORK_TYPES_TEXT_CARRIER;

            case TelephonyManager.ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G:

                return ALLOWED_NETWORK_TYPES_TEXT_ENABLE_2G;

            default:

                return Integer.toString(INVALID_ALLOWED_NETWORK_TYPES);

        }