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

Commit 2fad116e authored by EdenSu's avatar EdenSu
Browse files

Add carrier config for Visited Country FQDN 

Add resolution method type EPDG_ADDRESS_VISITED_COUNTRY.

Bug: 195384764
Test: Build & WFC works
      atest IwlanTests
Change-Id: I9b39775697a588bc4962ae62e734e3bb99eae95a
parent d1d70cfa

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -41215,6 +41215,7 @@ package android.telephony { 
    field public static final int EPDG_ADDRESS_PCO = 2; // 0x2

    field public static final int EPDG_ADDRESS_PLMN = 1; // 0x1

    field public static final int EPDG_ADDRESS_STATIC = 0; // 0x0

    field public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4; // 0x4

    field public static final int ID_TYPE_FQDN = 2; // 0x2

    field public static final int ID_TYPE_KEY_ID = 11; // 0xb

    field public static final int ID_TYPE_RFC822_ADDR = 3; // 0x3

telephony/java/android/telephony/CarrierConfigManager.java

+5 −2
Original line number Diff line number Diff line
@@ -4724,7 +4724,7 @@ public class CarrierConfigManager { 
        /**

         * A priority list of ePDG addresses to be used. Possible values are {@link

         * #EPDG_ADDRESS_STATIC}, {@link #EPDG_ADDRESS_PLMN}, {@link #EPDG_ADDRESS_PCO}, {@link

         * #EPDG_ADDRESS_CELLULAR_LOC}

         * #EPDG_ADDRESS_CELLULAR_LOC}, {@link #EPDG_ADDRESS_VISITED_COUNTRY}

         */

        public static final String KEY_EPDG_ADDRESS_PRIORITY_INT_ARRAY =

                KEY_PREFIX + "epdg_address_priority_int_array";
@@ -4899,7 +4899,8 @@ public class CarrierConfigManager { 
            EPDG_ADDRESS_STATIC,

            EPDG_ADDRESS_PLMN,

            EPDG_ADDRESS_PCO,

            EPDG_ADDRESS_CELLULAR_LOC

            EPDG_ADDRESS_CELLULAR_LOC,

            EPDG_ADDRESS_VISITED_COUNTRY

        })

        public @interface EpdgAddressType {}
@@ -4913,6 +4914,8 @@ public class CarrierConfigManager { 
        public static final int EPDG_ADDRESS_PCO = 2;

        /** Use cellular location to chose epdg server */

        public static final int EPDG_ADDRESS_CELLULAR_LOC = 3;

        /* Use Visited Country FQDN rule*/

        public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4;



        /** @hide */

        @IntDef({ID_TYPE_FQDN, ID_TYPE_RFC822_ADDR, ID_TYPE_KEY_ID})