support mno carrier id

Bug: 110559381
Test: CarrierResolverTest.testMnoCarrierId
Change-Id: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
Merged-in: Ifa1f69fc98b5a7034f28fb5690981087cd6c135a
This commit is contained in:
chen xu
2018-10-16 11:55:26 -07:00
parent e9c6da7b12
commit 6d4f5b2280
2 changed files with 22 additions and 0 deletions

View File

@@ -3448,6 +3448,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

View File

@@ -1163,6 +1163,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.