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

Commit 4e987476 authored by Yomna Nasser's avatar Yomna Nasser Committed by SongFerngWang
Browse files

Adds ALLOWED_NETWORK_TYPES_REASON_ENABLE_2G to Phone.java 

Test: m
Bug: b/163168917
Change-Id: Id73428f038f54392a67684dba3594452f869edc5
Merged-In: Id73428f038f54392a67684dba3594452f869edc5
parent bdd55517

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));
@@ -2342,6 +2344,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;

        }
@@ -2355,6 +2359,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);

        }