diff --git a/telephony/java/android/provider/Telephony.java b/telephony/java/android/provider/Telephony.java index 954bb44e8532a..3551742d60729 100644 --- a/telephony/java/android/provider/Telephony.java +++ b/telephony/java/android/provider/Telephony.java @@ -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}. + * + *
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. + *
Type: INTEGER
+ * @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. + *Type: TEXT in hex string
+ */ + public static final String PRIVILEGE_ACCESS_RULE = "privilege_access_rule"; + /** * The {@code content://} URI for this table. */ diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 82595ad3e18df..0620af9c55e82 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -1162,6 +1162,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. + *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.