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

Commit fccdf46a authored by Chen Xu's avatar Chen Xu Committed by Gerrit Code Review
Browse files

Merge changes from topic "carrier_id_aosp_cp" 

* changes:
  support mno carrier id
  support privilege access rule for carrier identification
parents bb58511b 6d4f5b22

telephony/java/android/provider/Telephony.java

+18 −0
Original line number Diff line number Diff line
@@ -3484,6 +3484,18 @@ public final class Telephony { 
         */

        public static final String CARRIER_ID = "carrier_id";



        /**

         * A unique mno carrier id. mno carrier shares the same {@link All#MCCMNC} as carrier id

         * and can be solely identified by {@link All#MCCMNC} only. If there is no such mno

         * carrier, then mno carrier id equals to {@link #CARRIER_ID carrier id}.

         *

         * <p>mno carrier id can be used as fallback id. When the exact carrier id configurations

         * are not found, usually fall back to its mno carrier id.

         * <P>Type: INTEGER </P>

         * @hide

         */

        public static final String MNO_CARRIER_ID = "mno_carrier_id";



        /**

         * Contains mappings between matching rules with carrier id for all carriers.

         * @hide
@@ -3537,6 +3549,12 @@ public final class Telephony { 
             */

            public static final String ICCID_PREFIX = "iccid_prefix";



            /**

             * Certificate for carrier privilege access rules.

             * <P>Type: TEXT in hex string </P>

             */

            public static final String PRIVILEGE_ACCESS_RULE = "privilege_access_rule";



            /**

             * The {@code content://} URI for this table.

             */

telephony/java/android/telephony/TelephonyManager.java

+10 −0
Original line number Diff line number Diff line
@@ -1161,6 +1161,16 @@ public class TelephonyManager { 
     */

    public static final String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID";



    /**

     * An int extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which indicates

     * the updated mno carrier id of the current subscription.

     * <p>Will be {@link TelephonyManager#UNKNOWN_CARRIER_ID} if the subscription is unavailable or

     * the carrier cannot be identified.

     *

     *@hide

     */

    public static final String EXTRA_MNO_CARRIER_ID = "android.telephony.extra.MNO_CARRIER_ID";



    /**

     * An string extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which

     * indicates the updated carrier name of the current subscription.