Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "carrier_id_aosp_cp" am: fccdf46adf

Browse Source 
am: 8463ad7760

Change-Id: I7a26c82c978706bc5a522af3ed2b9e2a96ec0fb6
This commit is contained in:
Chen Xu
2018-10-24 14:58:06 -07:00
committed by android-build-merger
parent 2b84af299e 8463ad7760
commit db45db791a
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
telephony/java/android/provider/Telephony.java
View File

@@ -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.
*/

10
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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.
* <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.