Merge "support mno carrier id" (21c589aa) · Commits · e / os / android_frameworks_base

telephony/java/android/provider/Telephony.java

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3523,6 +3523,18 @@ public final class Telephony {
	*/		*/
	public static final String CARRIER_ID = "carrier_id";		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.		* Contains mappings between matching rules with carrier id for all carriers.
	* @hide		* @hide

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1162,6 +1162,16 @@ public class TelephonyManager {
	*/		*/
	public static final String EXTRA_CARRIER_ID = "android.telephony.extra.CARRIER_ID";		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		* An string extra used with {@link #ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED} which
	* indicates the updated carrier name of the current subscription.		* indicates the updated carrier name of the current subscription.