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

Commit 63fcd15c authored by Kuen Yuet Cheung's avatar Kuen Yuet Cheung
Browse files

Add Iwlan ePDG PLMN Priority Config in CarrierConfigManager 

Bug: 226926218
Test: atest
Change-Id: Ifbdee35f2326c22658597eccf440eb531dfac33e
parent 9ce369b8

telephony/java/android/telephony/CarrierConfigManager.java

+46 −0
Original line number Original line Diff line number Diff line
@@ -8654,6 +8654,16 @@ public class CarrierConfigManager { 
        public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY =

        public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY =

                KEY_PREFIX + "epdg_address_priority_int_array";

                KEY_PREFIX + "epdg_address_priority_int_array";





        /**

         * A priority list of PLMN to be used in EPDG_ADDRESS_PLMN. Possible values are {@link

         * #EPDG_PLMN_RPLMN}, {@link #EPDG_PLMN_HPLMN}, {@link #EPDG_PLMN_EHPLMN_ALL}, {@link

         * #EPDG_PLMN_EHPLMN_FIRST}

         *

         * @hide

         */

        public static final String KEY_EPDG_PLMN_PRIORITY_INT_ARRAY =

                KEY_PREFIX + "epdg_plmn_priority_int_array";



        /** Epdg static IP address or FQDN */

        /** Epdg static IP address or FQDN */

        public static final String KEY_EPDG_STATIC_ADDRESS_STRING =

        public static final String KEY_EPDG_STATIC_ADDRESS_STRING =

                KEY_PREFIX + "epdg_static_address_string";

                KEY_PREFIX + "epdg_static_address_string";
@@ -8853,6 +8863,36 @@ public class CarrierConfigManager { 
        /** Use Visited Country FQDN rule*/

        /** Use Visited Country FQDN rule*/

        public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4;

        public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4;





        /** @hide */

        @IntDef({

                EPDG_PLMN_RPLMN,

                EPDG_PLMN_HPLMN,

                EPDG_PLMN_EHPLMN_ALL,

                EPDG_PLMN_EHPLMN_FIRST

        })

        public @interface EpdgAddressPlmnType {}



        /**

         * Use the Registered PLMN

         * @hide

         */

        public static final int EPDG_PLMN_RPLMN = 0;

        /**

         * Use the PLMN derived from IMSI

         * @hide

         */

        public static final int EPDG_PLMN_HPLMN = 1;

        /**

         * Use all EHPLMN from SIM EF files

         * @hide

         */

        public static final int EPDG_PLMN_EHPLMN_ALL = 2;

        /**

         * Use the first EHPLMN from SIM EF files

         * @hide

         */

        public static final int EPDG_PLMN_EHPLMN_FIRST = 3;



        /** @hide */

        /** @hide */

        @IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID})

        @IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID})

        public @interface IkeIdType {}

        public @interface IkeIdType {}
@@ -8988,6 +9028,12 @@ public class CarrierConfigManager { 
            defaults.putIntArray(

            defaults.putIntArray(

                    KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY,

                    KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY,

                    new int[] {EPDG_ADDRESS_PLMN, EPDG_ADDRESS_STATIC});

                    new int[] {EPDG_ADDRESS_PLMN, EPDG_ADDRESS_STATIC});

            defaults.putIntArray(

                    KEY_EPDG_PLMN_PRIORITY_INT_ARRAY,

                    new int[]{

                            EPDG_PLMN_RPLMN,

                            EPDG_PLMN_HPLMN,

                            EPDG_PLMN_EHPLMN_ALL});

            defaults.putStringArray(KEY_MCC_MNCS_STRING_ARRAY, new String[0]);

            defaults.putStringArray(KEY_MCC_MNCS_STRING_ARRAY, new String[0]);

            defaults.putInt(KEY_IKE_LOCAL_ID_TYPE_INT, ID_TYPE_RFC822_ADDR);

            defaults.putInt(KEY_IKE_LOCAL_ID_TYPE_INT, ID_TYPE_RFC822_ADDR);

            defaults.putInt(KEY_IKE_REMOTE_ID_TYPE_INT, ID_TYPE_FQDN);

            defaults.putInt(KEY_IKE_REMOTE_ID_TYPE_INT, ID_TYPE_FQDN);