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

Merge "[API Review] APIs in SubscriptionManager"

Browse Source
This commit is contained in:
Peter Wang
2020-03-20 19:54:58 +00:00
committed by Gerrit Code Review
parent c33377b077 0ddf44070b
commit 54af9046ac
8 changed files with 2409 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
api/system-current.txt
View File

@@ -6961,76 +6961,6 @@ package android.provider {
field @NonNull public static final String ENABLE_TEST_ALERT_PREF = "enable_test_alerts";
}
public static final class Telephony.SimInfo {
field public static final String ACCESS_RULES = "access_rules";
field public static final String ACCESS_RULES_FROM_CARRIER_CONFIGS = "access_rules_from_carrier_configs";
field public static final String ALLOWED_NETWORK_TYPES = "allowed_network_types";
field public static final String CARD_ID = "card_id";
field public static final String CARRIER_ID = "carrier_id";
field public static final String CARRIER_NAME = "carrier_name";
field public static final String CB_ALERT_REMINDER_INTERVAL = "alert_reminder_interval";
field public static final String CB_ALERT_SOUND_DURATION = "alert_sound_duration";
field public static final String CB_ALERT_SPEECH = "enable_alert_speech";
field public static final String CB_ALERT_VIBRATE = "enable_alert_vibrate";
field public static final String CB_AMBER_ALERT = "enable_cmas_amber_alerts";
field public static final String CB_CHANNEL_50_ALERT = "enable_channel_50_alerts";
field public static final String CB_CMAS_TEST_ALERT = "enable_cmas_test_alerts";
field public static final String CB_EMERGENCY_ALERT = "enable_emergency_alerts";
field public static final String CB_ETWS_TEST_ALERT = "enable_etws_test_alerts";
field public static final String CB_EXTREME_THREAT_ALERT = "enable_cmas_extreme_threat_alerts";
field public static final String CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";
field public static final String CB_SEVERE_THREAT_ALERT = "enable_cmas_severe_threat_alerts";
field public static final String COLOR = "color";
field @NonNull public static final android.net.Uri CONTENT_URI;
field public static final String DATA_ENABLED_OVERRIDE_RULES = "data_enabled_override_rules";
field public static final String DATA_ROAMING = "data_roaming";
field public static final int DATA_ROAMING_DEFAULT = 0; // 0x0
field public static final int DATA_ROAMING_DISABLE = 0; // 0x0
field public static final int DATA_ROAMING_ENABLE = 1; // 0x1
field public static final String DISPLAY_NAME = "display_name";
field public static final String EHPLMNS = "ehplmns";
field public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
field public static final String GROUP_OWNER = "group_owner";
field public static final String GROUP_UUID = "group_uuid";
field public static final String HPLMNS = "hplmns";
field public static final String ICC_ID = "icc_id";
field public static final String IMSI = "imsi";
field public static final String IMS_RCS_UCE_ENABLED = "ims_rcs_uce_enabled";
field public static final String ISO_COUNTRY_CODE = "iso_country_code";
field public static final String IS_EMBEDDED = "is_embedded";
field public static final String IS_OPPORTUNISTIC = "is_opportunistic";
field public static final String IS_REMOVABLE = "is_removable";
field public static final String MCC = "mcc";
field public static final String MCC_STRING = "mcc_string";
field public static final String MNC = "mnc";
field public static final String MNC_STRING = "mnc_string";
field public static final String NAME_SOURCE = "name_source";
field public static final int NAME_SOURCE_CARRIER = 3; // 0x3
field public static final int NAME_SOURCE_DEFAULT = 0; // 0x0
field public static final int NAME_SOURCE_SIM_PNN = 4; // 0x4
field public static final int NAME_SOURCE_SIM_SPN = 1; // 0x1
field public static final int NAME_SOURCE_USER_INPUT = 2; // 0x2
field public static final String NUMBER = "number";
field public static final String PROFILE_CLASS = "profile_class";
field public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff
field public static final int PROFILE_CLASS_OPERATIONAL = 2; // 0x2
field public static final int PROFILE_CLASS_PROVISIONING = 1; // 0x1
field public static final int PROFILE_CLASS_TESTING = 0; // 0x0
field public static final int PROFILE_CLASS_UNSET = -1; // 0xffffffff
field public static final int SIM_NOT_INSERTED = -1; // 0xffffffff
field public static final String SIM_SLOT_INDEX = "sim_id";
field public static final String SUBSCRIPTION_TYPE = "subscription_type";
field public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0; // 0x0
field public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1; // 0x1
field public static final String UICC_APPLICATIONS_ENABLED = "uicc_applications_enabled";
field public static final String UNIQUE_KEY_SUBSCRIPTION_ID = "_id";
field public static final String VT_IMS_ENABLED = "vt_ims_enabled";
field public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";
field public static final String WFC_IMS_MODE = "wfc_ims_mode";
field public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";
field public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
}
public static final class Telephony.Sms.Intents {
field public static final String ACTION_SMS_EMERGENCY_CB_RECEIVED = "android.provider.action.SMS_EMERGENCY_CB_RECEIVED";
}
@@ -9206,7 +9136,7 @@ package android.telephony {
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setUiccApplicationsEnabled(int, boolean);
field @RequiresPermission(android.Manifest.permission.MANAGE_SUBSCRIPTION_PLANS) public static final String ACTION_SUBSCRIPTION_PLANS_CHANGED = "android.telephony.action.SUBSCRIPTION_PLANS_CHANGED";
field @NonNull public static final android.net.Uri ADVANCED_CALLING_ENABLED_CONTENT_URI;
field public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff
field @Deprecated public static final int PROFILE_CLASS_DEFAULT = -1; // 0xffffffff
field public static final int PROFILE_CLASS_OPERATIONAL = 2; // 0x2
field public static final int PROFILE_CLASS_PROVISIONING = 1; // 0x1
field public static final int PROFILE_CLASS_TESTING = 0; // 0x0

28
core/java/android/provider/Settings.java
View File

@@ -13409,12 +13409,12 @@ public final class Settings {
* <p>
* Type: int (0 for false, 1 for true)
* @hide
* @deprecated Use {@link android.provider.Telephony.SimInfo#ENHANCED_4G_MODE_ENABLED}
* instead.
* @deprecated Use
* {@link android.provider.Telephony.SimInfo#COLUMN_ENHANCED_4G_MODE_ENABLED} instead.
*/
@Deprecated
public static final String ENHANCED_4G_MODE_ENABLED =
Telephony.SimInfo.ENHANCED_4G_MODE_ENABLED;
Telephony.SimInfo.COLUMN_ENHANCED_4G_MODE_ENABLED;
/**
* Whether VT (Video Telephony over IMS) is enabled
@@ -13422,10 +13422,10 @@ public final class Settings {
* Type: int (0 for false, 1 for true)
*
* @hide
* @deprecated Use {@link android.provider.Telephony.SimInfo#VT_IMS_ENABLED} instead.
* @deprecated Use {@link android.provider.Telephony.SimInfo#COLUMN_VT_IMS_ENABLED} instead.
*/
@Deprecated
public static final String VT_IMS_ENABLED = Telephony.SimInfo.VT_IMS_ENABLED;
public static final String VT_IMS_ENABLED = Telephony.SimInfo.COLUMN_VT_IMS_ENABLED;
/**
* Whether WFC is enabled
@@ -13433,10 +13433,11 @@ public final class Settings {
* Type: int (0 for false, 1 for true)
*
* @hide
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_ENABLED} instead.
* @deprecated Use
* {@link android.provider.Telephony.SimInfo#COLUMN_WFC_IMS_ENABLED} instead.
*/
@Deprecated
public static final String WFC_IMS_ENABLED = Telephony.SimInfo.WFC_IMS_ENABLED;
public static final String WFC_IMS_ENABLED = Telephony.SimInfo.COLUMN_WFC_IMS_ENABLED;
/**
* WFC mode on home/non-roaming network.
@@ -13444,10 +13445,10 @@ public final class Settings {
* Type: int - 2=Wi-Fi preferred, 1=Cellular preferred, 0=Wi-Fi only
*
* @hide
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_MODE} instead.
* @deprecated Use {@link android.provider.Telephony.SimInfo#COLUMN_WFC_IMS_MODE} instead.
*/
@Deprecated
public static final String WFC_IMS_MODE = Telephony.SimInfo.WFC_IMS_MODE;
public static final String WFC_IMS_MODE = Telephony.SimInfo.COLUMN_WFC_IMS_MODE;
/**
* WFC mode on roaming network.
@@ -13455,11 +13456,12 @@ public final class Settings {
* Type: int - see {@link #WFC_IMS_MODE} for values
*
* @hide
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_ROAMING_MODE}
* @deprecated Use {@link android.provider.Telephony.SimInfo#COLUMN_WFC_IMS_ROAMING_MODE}
* instead.
*/
@Deprecated
public static final String WFC_IMS_ROAMING_MODE = Telephony.SimInfo.WFC_IMS_ROAMING_MODE;
public static final String WFC_IMS_ROAMING_MODE =
Telephony.SimInfo.COLUMN_WFC_IMS_ROAMING_MODE;
/**
* Whether WFC roaming is enabled
@@ -13467,12 +13469,12 @@ public final class Settings {
* Type: int (0 for false, 1 for true)
*
* @hide
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_ROAMING_ENABLED}
* @deprecated Use {@link android.provider.Telephony.SimInfo#COLUMN_WFC_IMS_ROAMING_ENABLED}
* instead
*/
@Deprecated
public static final String WFC_IMS_ROAMING_ENABLED =
Telephony.SimInfo.WFC_IMS_ROAMING_ENABLED;
Telephony.SimInfo.COLUMN_WFC_IMS_ROAMING_ENABLED;
/**
* Whether user can enable/disable LTE as a preferred network. A carrier might control

261
core/java/android/provider/Telephony.java
View File

@@ -4939,7 +4939,6 @@ public final class Telephony {
* Contains SIM Information
* @hide
*/
@SystemApi
public static final class SimInfo {
/**
* Not instantiable.
@@ -4949,6 +4948,7 @@ public final class Telephony {
/**
* The {@code content://} style URI for this provider.
* @hide
*/
@NonNull
public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
@@ -4956,25 +4956,32 @@ public final class Telephony {
/**
* TelephonyProvider unique key column name is the subscription id.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String UNIQUE_KEY_SUBSCRIPTION_ID = "_id";
public static final String COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID = "_id";
/**
* TelephonyProvider column name for a unique identifier for the subscription within the
* specific subscription type. For example, it contains SIM ICC Identifier subscriptions
* on Local SIMs. and Mac-address for Remote-SIM Subscriptions for Bluetooth devices.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String ICC_ID = "icc_id";
public static final String COLUMN_ICC_ID = "icc_id";
/**
* TelephonyProvider column name for user SIM_SlOT_INDEX
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String SIM_SLOT_INDEX = "sim_id";
public static final String COLUMN_SIM_SLOT_INDEX = "sim_id";
/**
* SIM is not inserted
* @hide
*/
public static final int SIM_NOT_INSERTED = -1;
@@ -4983,14 +4990,18 @@ public final class Telephony {
* <P>Type: INTEGER (int)</P> {@link #SUBSCRIPTION_TYPE_LOCAL_SIM} for Local-SIM
* Subscriptions, {@link #SUBSCRIPTION_TYPE_REMOTE_SIM} for Remote-SIM Subscriptions.
* Default value is 0.
*
* @hide
*/
public static final String SUBSCRIPTION_TYPE = "subscription_type";
public static final String COLUMN_SUBSCRIPTION_TYPE = "subscription_type";
/**
* This constant is to designate a subscription as a Local-SIM Subscription.
* <p> A Local-SIM can be a physical SIM inserted into a sim-slot in the device, or eSIM on
* the device.
* </p>
*
* @hide
*/
public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0;
@@ -5017,6 +5028,8 @@ public final class Telephony {
* phone; i.e., new Remote-SIM subscription treats the reconnected phone as a Remote-SIM
* that was never seen before.
* </p>
*
* @hide
*/
public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1;
@@ -5029,71 +5042,89 @@ public final class Telephony {
* subscription and while is in voice call.
*
* Default value is empty string.
*
* @hide
*/
public static final String DATA_ENABLED_OVERRIDE_RULES = "data_enabled_override_rules";
public static final String COLUMN_DATA_ENABLED_OVERRIDE_RULES =
"data_enabled_override_rules";
/**
* TelephonyProvider column name for user displayed name.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String DISPLAY_NAME = "display_name";
public static final String COLUMN_DISPLAY_NAME = "display_name";
/**
* TelephonyProvider column name for the service provider name for the SIM.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String CARRIER_NAME = "carrier_name";
public static final String COLUMN_CARRIER_NAME = "carrier_name";
/**
* TelephonyProvider column name for source of the user displayed name.
* <P>Type: INT (int)</P> with one of the NAME_SOURCE_XXXX values below
*
* @hide
*/
public static final String NAME_SOURCE = "name_source";
public static final String COLUMN_NAME_SOURCE = "name_source";
/** The name_source is the default, which is from the carrier id. */
public static final int NAME_SOURCE_DEFAULT = 0;
/** The name_source is from the carrier id. {@hide} */
public static final int NAME_SOURCE_CARRIER_ID = 0;
/**
* The name_source is from SIM EF_SPN.
* @hide
*/
public static final int NAME_SOURCE_SIM_SPN = 1;
/**
* The name_source is from user input
* @hide
*/
public static final int NAME_SOURCE_USER_INPUT = 2;
/**
* The name_source is carrier (carrier app, carrier config, etc.)
* @hide
*/
public static final int NAME_SOURCE_CARRIER = 3;
/**
* The name_source is from SIM EF_PNN.
* @hide
*/
public static final int NAME_SOURCE_SIM_PNN = 4;
/**
* TelephonyProvider column name for the color of a SIM.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String COLOR = "color";
public static final String COLUMN_COLOR = "color";
/** TelephonyProvider column name for the default color of a SIM {@hide} */
/** The default color of a SIM {@hide} */
public static final int COLOR_DEFAULT = 0;
/**
* TelephonyProvider column name for the phone number of a SIM.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String NUMBER = "number";
public static final String COLUMN_NUMBER = "number";
/**
* TelephonyProvider column name for the number display format of a SIM.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String DISPLAY_NUMBER_FORMAT = "display_number_format";
public static final String COLUMN_DISPLAY_NUMBER_FORMAT = "display_number_format";
/**
* TelephonyProvider column name for the default display format of a SIM
@@ -5104,73 +5135,89 @@ public final class Telephony {
/**
* TelephonyProvider column name for whether data roaming is enabled.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String DATA_ROAMING = "data_roaming";
public static final String COLUMN_DATA_ROAMING = "data_roaming";
/** Indicates that data roaming is enabled for a subscription */
/** Indicates that data roaming is enabled for a subscription {@hide} */
public static final int DATA_ROAMING_ENABLE = 1;
/** Indicates that data roaming is disabled for a subscription */
/** Indicates that data roaming is disabled for a subscription {@hide} */
public static final int DATA_ROAMING_DISABLE = 0;
/** TelephonyProvider column name for default data roaming setting: disable */
public static final int DATA_ROAMING_DEFAULT = DATA_ROAMING_DISABLE;
/**
* TelephonyProvider column name for subscription carrier id.
* @see TelephonyManager#getSimCarrierId()
* <p>Type: INTEGER (int) </p>
*
* @hide
*/
public static final String CARRIER_ID = "carrier_id";
public static final String COLUMN_CARRIER_ID = "carrier_id";
/**
* A comma-separated list of EHPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String EHPLMNS = "ehplmns";
public static final String COLUMN_EHPLMNS = "ehplmns";
/**
* A comma-separated list of HPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String HPLMNS = "hplmns";
public static final String COLUMN_HPLMNS = "hplmns";
/**
* TelephonyProvider column name for the MCC associated with a SIM, stored as a string.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String MCC_STRING = "mcc_string";
public static final String COLUMN_MCC_STRING = "mcc_string";
/**
* TelephonyProvider column name for the MNC associated with a SIM, stored as a string.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String MNC_STRING = "mnc_string";
public static final String COLUMN_MNC_STRING = "mnc_string";
/**
* TelephonyProvider column name for the MCC associated with a SIM.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String MCC = "mcc";
public static final String COLUMN_MCC = "mcc";
/**
* TelephonyProvider column name for the MNC associated with a SIM.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String MNC = "mnc";
public static final String COLUMN_MNC = "mnc";
/**
* TelephonyProvider column name for the iso country code associated with a SIM.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String ISO_COUNTRY_CODE = "iso_country_code";
public static final String COLUMN_ISO_COUNTRY_CODE = "iso_country_code";
/**
* TelephonyProvider column name for the sim provisioning status associated with a SIM.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String SIM_PROVISIONING_STATUS = "sim_provisioning_status";
public static final String COLUMN_SIM_PROVISIONING_STATUS = "sim_provisioning_status";
/** The sim is provisioned {@hide} */
public static final int SIM_PROVISIONED = 0;
@@ -5179,147 +5226,174 @@ public final class Telephony {
* TelephonyProvider column name for whether a subscription is embedded (that is, present on
* an eSIM).
* <p>Type: INTEGER (int), 1 for embedded or 0 for non-embedded.
*
* @hide
*/
public static final String IS_EMBEDDED = "is_embedded";
public static final String COLUMN_IS_EMBEDDED = "is_embedded";
/**
* TelephonyProvider column name for SIM card identifier. For UICC card it is the ICCID of
* the current enabled profile on the card, while for eUICC card it is the EID of the card.
* <P>Type: TEXT (String)</P>
*
* @hide
*/
public static final String CARD_ID = "card_id";
public static final String COLUMN_CARD_ID = "card_id";
/**
* TelephonyProvider column name for the encoded {@link UiccAccessRule}s from
* {@link UiccAccessRule#encodeRules}. Only present if {@link #IS_EMBEDDED} is 1.
* {@link UiccAccessRule#encodeRules}. Only present if {@link #COLUMN_IS_EMBEDDED} is 1.
* <p>TYPE: BLOB
*
* @hide
*/
public static final String ACCESS_RULES = "access_rules";
public static final String COLUMN_ACCESS_RULES = "access_rules";
/**
* TelephonyProvider column name for the encoded {@link UiccAccessRule}s from
* {@link UiccAccessRule#encodeRules} but for the rules that come from CarrierConfigs.
* Only present if there are access rules in CarrierConfigs
* <p>TYPE: BLOB
*
* @hide
*/
public static final String ACCESS_RULES_FROM_CARRIER_CONFIGS =
public static final String COLUMN_ACCESS_RULES_FROM_CARRIER_CONFIGS =
"access_rules_from_carrier_configs";
/**
* TelephonyProvider column name identifying whether an embedded subscription is on a
* removable card. Such subscriptions are marked inaccessible as soon as the current card
* is removed. Otherwise, they will remain accessible unless explicitly deleted. Only
* present if {@link #IS_EMBEDDED} is 1.
* present if {@link #COLUMN_IS_EMBEDDED} is 1.
* <p>TYPE: INTEGER (int), 1 for removable or 0 for non-removable.
*
* @hide
*/
public static final String IS_REMOVABLE = "is_removable";
public static final String COLUMN_IS_REMOVABLE = "is_removable";
/** TelephonyProvider column name for extreme threat in CB settings */
public static final String CB_EXTREME_THREAT_ALERT = "enable_cmas_extreme_threat_alerts";
/** TelephonyProvider column name for extreme threat in CB settings {@hide} */
public static final String COLUMN_CB_EXTREME_THREAT_ALERT =
"enable_cmas_extreme_threat_alerts";
/** TelephonyProvider column name for severe threat in CB settings */
public static final String CB_SEVERE_THREAT_ALERT = "enable_cmas_severe_threat_alerts";
/** TelephonyProvider column name for severe threat in CB settings {@hide} */
public static final String COLUMN_CB_SEVERE_THREAT_ALERT =
"enable_cmas_severe_threat_alerts";
/** TelephonyProvider column name for amber alert in CB settings */
public static final String CB_AMBER_ALERT = "enable_cmas_amber_alerts";
/** TelephonyProvider column name for amber alert in CB settings {@hide} */
public static final String COLUMN_CB_AMBER_ALERT = "enable_cmas_amber_alerts";
/** TelephonyProvider column name for emergency alert in CB settings */
public static final String CB_EMERGENCY_ALERT = "enable_emergency_alerts";
/** TelephonyProvider column name for emergency alert in CB settings {@hide} */
public static final String COLUMN_CB_EMERGENCY_ALERT = "enable_emergency_alerts";
/** TelephonyProvider column name for alert sound duration in CB settings */
public static final String CB_ALERT_SOUND_DURATION = "alert_sound_duration";
/** TelephonyProvider column name for alert sound duration in CB settings {@hide} */
public static final String COLUMN_CB_ALERT_SOUND_DURATION = "alert_sound_duration";
/** TelephonyProvider column name for alert reminder interval in CB settings */
public static final String CB_ALERT_REMINDER_INTERVAL = "alert_reminder_interval";
/** TelephonyProvider column name for alert reminder interval in CB settings {@hide} */
public static final String COLUMN_CB_ALERT_REMINDER_INTERVAL = "alert_reminder_interval";
/** TelephonyProvider column name for enabling vibrate in CB settings */
public static final String CB_ALERT_VIBRATE = "enable_alert_vibrate";
/** TelephonyProvider column name for enabling vibrate in CB settings {@hide} */
public static final String COLUMN_CB_ALERT_VIBRATE = "enable_alert_vibrate";
/** TelephonyProvider column name for enabling alert speech in CB settings */
public static final String CB_ALERT_SPEECH = "enable_alert_speech";
/** TelephonyProvider column name for enabling alert speech in CB settings {@hide} */
public static final String COLUMN_CB_ALERT_SPEECH = "enable_alert_speech";
/** TelephonyProvider column name for ETWS test alert in CB settings */
public static final String CB_ETWS_TEST_ALERT = "enable_etws_test_alerts";
/** TelephonyProvider column name for ETWS test alert in CB settings {@hide} */
public static final String COLUMN_CB_ETWS_TEST_ALERT = "enable_etws_test_alerts";
/** TelephonyProvider column name for enable channel50 alert in CB settings */
public static final String CB_CHANNEL_50_ALERT = "enable_channel_50_alerts";
/** TelephonyProvider column name for enable channel50 alert in CB settings {@hide} */
public static final String COLUMN_CB_CHANNEL_50_ALERT = "enable_channel_50_alerts";
/** TelephonyProvider column name for CMAS test alert in CB settings */
public static final String CB_CMAS_TEST_ALERT = "enable_cmas_test_alerts";
/** TelephonyProvider column name for CMAS test alert in CB settings {@hide} */
public static final String COLUMN_CB_CMAS_TEST_ALERT = "enable_cmas_test_alerts";
/** TelephonyProvider column name for Opt out dialog in CB settings */
public static final String CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";
/** TelephonyProvider column name for Opt out dialog in CB settings {@hide} */
public static final String COLUMN_CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";
/**
* TelephonyProvider column name for enable Volte.
*
* If this setting is not initialized (set to -1) then we use the Carrier Config value
* {@link CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}.
*
* @hide
*/
public static final String ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
public static final String COLUMN_ENHANCED_4G_MODE_ENABLED = "volte_vt_enabled";
/** TelephonyProvider column name for enable VT (Video Telephony over IMS) */
public static final String VT_IMS_ENABLED = "vt_ims_enabled";
/** TelephonyProvider column name for enable VT (Video Telephony over IMS) {@hide} */
public static final String COLUMN_VT_IMS_ENABLED = "vt_ims_enabled";
/** TelephonyProvider column name for enable Wifi calling */
public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";
/** TelephonyProvider column name for enable Wifi calling {@hide} */
public static final String COLUMN_WFC_IMS_ENABLED = "wfc_ims_enabled";
/** TelephonyProvider column name for Wifi calling mode */
public static final String WFC_IMS_MODE = "wfc_ims_mode";
/** TelephonyProvider column name for Wifi calling mode {@hide} */
public static final String COLUMN_WFC_IMS_MODE = "wfc_ims_mode";
/** TelephonyProvider column name for Wifi calling mode in roaming */
public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
/** TelephonyProvider column name for Wifi calling mode in roaming {@hide} */
public static final String COLUMN_WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
/** TelephonyProvider column name for enable Wifi calling in roaming */
public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";
/** TelephonyProvider column name for enable Wifi calling in roaming {@hide} */
public static final String COLUMN_WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";
/**
* Determines if the user has enabled IMS RCS User Capability Exchange (UCE) for this
* subscription.
* TelephonyProvider column name for determining if the user has enabled IMS RCS User
* Capability Exchange (UCE) for this subscription.
*
* @hide
*/
public static final String IMS_RCS_UCE_ENABLED = "ims_rcs_uce_enabled";
public static final String COLUMN_IMS_RCS_UCE_ENABLED = "ims_rcs_uce_enabled";
/**
* TelephonyProvider column name for whether a subscription is opportunistic, that is,
* whether the network it connects to is limited in functionality or coverage.
* For example, CBRS.
* <p>Type: INTEGER (int), 1 for opportunistic or 0 for non-opportunistic.
*
* @hide
*/
public static final String IS_OPPORTUNISTIC = "is_opportunistic";
public static final String COLUMN_IS_OPPORTUNISTIC = "is_opportunistic";
/**
* TelephonyProvider column name for group ID. Subscriptions with same group ID
* are considered bundled together, and should behave as a single subscription at
* certain scenarios.
*
* @hide
*/
public static final String GROUP_UUID = "group_uuid";
public static final String COLUMN_GROUP_UUID = "group_uuid";
/**
* TelephonyProvider column name for group owner. It's the package name who created
* the subscription group.
*
* @hide
*/
public static final String GROUP_OWNER = "group_owner";
public static final String COLUMN_GROUP_OWNER = "group_owner";
/**
* TelephonyProvider column name for whether a subscription is metered or not, that is,
* whether the network it connects to charges for subscription or not. For example, paid
* CBRS or unpaid.
*
* @hide
*/
public static final String IS_METERED = "is_metered";
public static final String COLUMN_IS_METERED = "is_metered";
/**
* TelephonyProvider column name for the profile class of a subscription
* Only present if {@link #IS_EMBEDDED} is 1.
* Only present if {@link #COLUMN_IS_EMBEDDED} is 1.
* <P>Type: INTEGER (int)</P>
*
* @hide
*/
public static final String PROFILE_CLASS = "profile_class";
public static final String COLUMN_PROFILE_CLASS = "profile_class";
/**
* A testing profile can be pre-loaded or downloaded onto
* the eUICC and provides connectivity to test equipment
* for the purpose of testing the device and the eUICC. It
* is not intended to store any operator credentials.
*
* @hide
*/
public static final int PROFILE_CLASS_TESTING = 0;
@@ -5327,6 +5401,8 @@ public final class Telephony {
* A provisioning profile is pre-loaded onto the eUICC and
* provides connectivity to a mobile network solely for the
* purpose of provisioning profiles.
*
* @hide
*/
public static final int PROFILE_CLASS_PROVISIONING = 1;
@@ -5334,6 +5410,8 @@ public final class Telephony {
* An operational profile can be pre-loaded or downloaded
* onto the eUICC and provides services provided by the
* operator.
*
* @hide
*/
public static final int PROFILE_CLASS_OPERATIONAL = 2;
@@ -5341,25 +5419,32 @@ public final class Telephony {
* The profile class is unset. This occurs when profile class
* info is not available. The subscription either has no profile
* metadata or the profile metadata did not encode profile class.
*
* @hide
*/
public static final int PROFILE_CLASS_UNSET = -1;
/** Default profile class */
public static final int PROFILE_CLASS_DEFAULT = PROFILE_CLASS_UNSET;
/**
* IMSI (International Mobile Subscriber Identity).
* <P>Type: TEXT </P>
*
* @hide
*/
public static final String IMSI = "imsi";
public static final String COLUMN_IMSI = "imsi";
/** Whether uicc applications is set to be enabled or disabled. By default it's enabled. */
public static final String UICC_APPLICATIONS_ENABLED = "uicc_applications_enabled";
/**
* Whether uicc applications is set to be enabled or disabled. By default it's enabled.
* @hide
*/
public static final String COLUMN_UICC_APPLICATIONS_ENABLED = "uicc_applications_enabled";
/**
* TelephonyProvider column name for allowed network types. Indicate which network types
* are allowed. Default is -1.
* <P>Type: BIGINT (long) </P>
*
* @hide
*/
public static final String ALLOWED_NETWORK_TYPES = "allowed_network_types";
public static final String COLUMN_ALLOWED_NETWORK_TYPES = "allowed_network_types";
}
}

8
packages/SystemUI/tests/src/com/android/keyguard/CarrierTextControllerTest.java
View File

@@ -19,7 +19,7 @@ package com.android.keyguard;
import static android.telephony.SubscriptionManager.DATA_ROAMING_DISABLE;
import static android.telephony.SubscriptionManager.DATA_ROAMING_ENABLE;
import static android.telephony.SubscriptionManager.NAME_SOURCE_DEFAULT;
import static android.telephony.SubscriptionManager.NAME_SOURCE_CARRIER_ID;
import static junit.framework.Assert.assertTrue;
import static junit.framework.TestCase.assertFalse;
@@ -79,14 +79,14 @@ public class CarrierTextControllerTest extends SysuiTestCase {
private static final String TEST_CARRIER_2 = "TEST_CARRIER_2";
private static final int TEST_CARRIER_ID = 1;
private static final SubscriptionInfo TEST_SUBSCRIPTION = new SubscriptionInfo(0, "", 0,
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_DEFAULT, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "",
DATA_ROAMING_DISABLE, null, null, null, null, false, null, "", false, null,
TEST_CARRIER_ID, 0);
private static final SubscriptionInfo TEST_SUBSCRIPTION_NULL = new SubscriptionInfo(0, "", 0,
TEST_CARRIER, null, NAME_SOURCE_DEFAULT, 0xFFFFFF, "", DATA_ROAMING_DISABLE,
TEST_CARRIER, null, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "", DATA_ROAMING_DISABLE,
null, null, null, null, false, null, "");
private static final SubscriptionInfo TEST_SUBSCRIPTION_ROAMING = new SubscriptionInfo(0, "", 0,
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_DEFAULT, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "",
DATA_ROAMING_ENABLE, null, null, null, null, false, null, "");
@Mock
private WifiManager mWifiManager;

6
packages/SystemUI/tests/src/com/android/keyguard/KeyguardUpdateMonitorTest.java
View File

@@ -17,7 +17,7 @@
package com.android.keyguard;
import static android.telephony.SubscriptionManager.DATA_ROAMING_DISABLE;
import static android.telephony.SubscriptionManager.NAME_SOURCE_DEFAULT;
import static android.telephony.SubscriptionManager.NAME_SOURCE_CARRIER_ID;
import static com.google.common.truth.Truth.assertThat;
@@ -83,11 +83,11 @@ public class KeyguardUpdateMonitorTest extends SysuiTestCase {
private static final int TEST_CARRIER_ID = 1;
private static final String TEST_GROUP_UUID = "59b5c870-fc4c-47a4-a99e-9db826b48b24";
private static final SubscriptionInfo TEST_SUBSCRIPTION = new SubscriptionInfo(1, "", 0,
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_DEFAULT, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "",
DATA_ROAMING_DISABLE, null, null, null, null, false, null, "", false, TEST_GROUP_UUID,
TEST_CARRIER_ID, 0);
private static final SubscriptionInfo TEST_SUBSCRIPTION_2 = new SubscriptionInfo(2, "", 0,
TEST_CARRIER, TEST_CARRIER_2, NAME_SOURCE_DEFAULT, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER_2, NAME_SOURCE_CARRIER_ID, 0xFFFFFF, "",
DATA_ROAMING_DISABLE, null, null, null, null, false, null, "", true, TEST_GROUP_UUID,
TEST_CARRIER_ID, 0);
@Mock

2151
telephony/api/system-current.txt Normal file
View File

File diff suppressed because it is too large Load Diff

2
telephony/java/android/telephony/SubscriptionInfo.java
View File

@@ -226,7 +226,7 @@ public class SubscriptionInfo implements Parcelable {
this(id, iccId, simSlotIndex, displayName, carrierName, nameSource, iconTint, number,
roaming, icon, mcc, mnc, countryIso, isEmbedded, nativeAccessRules, cardString, -1,
false, null, false, TelephonyManager.UNKNOWN_CARRIER_ID,
SubscriptionManager.PROFILE_CLASS_DEFAULT,
SubscriptionManager.PROFILE_CLASS_UNSET,
SubscriptionManager.SUBSCRIPTION_TYPE_LOCAL_SIM, null, null, true);
}

119
telephony/java/android/telephony/SubscriptionManager.java
View File

@@ -265,7 +265,8 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String UNIQUE_KEY_SUBSCRIPTION_ID = SimInfo.UNIQUE_KEY_SUBSCRIPTION_ID;
public static final String UNIQUE_KEY_SUBSCRIPTION_ID =
SimInfo.COLUMN_UNIQUE_KEY_SUBSCRIPTION_ID;
/**
* TelephonyProvider column name for a unique identifier for the subscription within the
@@ -274,14 +275,14 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String ICC_ID = SimInfo.ICC_ID;
public static final String ICC_ID = SimInfo.COLUMN_ICC_ID;
/**
* TelephonyProvider column name for user SIM_SlOT_INDEX
* <P>Type: INTEGER (int)</P>
*/
/** @hide */
public static final String SIM_SLOT_INDEX = SimInfo.SIM_SLOT_INDEX;
public static final String SIM_SLOT_INDEX = SimInfo.COLUMN_SIM_SLOT_INDEX;
/** SIM is not inserted */
/** @hide */
@@ -300,7 +301,7 @@ public class SubscriptionManager {
* Default value is 0.
*/
/** @hide */
public static final String SUBSCRIPTION_TYPE = SimInfo.SUBSCRIPTION_TYPE;
public static final String SUBSCRIPTION_TYPE = SimInfo.COLUMN_SUBSCRIPTION_TYPE;
/**
* TelephonyProvider column name data_enabled_override_rules.
@@ -313,7 +314,8 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String DATA_ENABLED_OVERRIDE_RULES = SimInfo.DATA_ENABLED_OVERRIDE_RULES;
public static final String DATA_ENABLED_OVERRIDE_RULES =
SimInfo.COLUMN_DATA_ENABLED_OVERRIDE_RULES;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@@ -362,14 +364,14 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String DISPLAY_NAME = SimInfo.DISPLAY_NAME;
public static final String DISPLAY_NAME = SimInfo.COLUMN_DISPLAY_NAME;
/**
* TelephonyProvider column name for the service provider name for the SIM.
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String CARRIER_NAME = SimInfo.CARRIER_NAME;
public static final String CARRIER_NAME = SimInfo.COLUMN_CARRIER_NAME;
/**
* Default name resource
@@ -383,13 +385,13 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String NAME_SOURCE = SimInfo.NAME_SOURCE;
public static final String NAME_SOURCE = SimInfo.COLUMN_NAME_SOURCE;
/**
* The name_source is the default, which is from the carrier id.
* The name_source is from the carrier id.
* @hide
*/
public static final int NAME_SOURCE_DEFAULT = SimInfo.NAME_SOURCE_DEFAULT;
public static final int NAME_SOURCE_CARRIER_ID = SimInfo.NAME_SOURCE_CARRIER_ID;
/**
* The name_source is from SIM EF_SPN.
@@ -420,7 +422,7 @@ public class SubscriptionManager {
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"NAME_SOURCE_"},
value = {
NAME_SOURCE_DEFAULT,
NAME_SOURCE_CARRIER_ID,
NAME_SOURCE_SIM_SPN,
NAME_SOURCE_USER_INPUT,
NAME_SOURCE_CARRIER,
@@ -433,21 +435,21 @@ public class SubscriptionManager {
* <P>Type: INTEGER (int)</P>
*/
/** @hide */
public static final String COLOR = SimInfo.COLOR;
public static final String HUE = SimInfo.COLUMN_COLOR;
/**
* TelephonyProvider column name for the phone number of a SIM.
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String NUMBER = SimInfo.NUMBER;
public static final String NUMBER = SimInfo.COLUMN_NUMBER;
/**
* TelephonyProvider column name for whether data roaming is enabled.
* <P>Type: INTEGER (int)</P>
*/
/** @hide */
public static final String DATA_ROAMING = SimInfo.DATA_ROAMING;
public static final String DATA_ROAMING = SimInfo.COLUMN_DATA_ROAMING;
/** Indicates that data roaming is enabled for a subscription */
public static final int DATA_ROAMING_ENABLE = SimInfo.DATA_ROAMING_ENABLE;
@@ -455,63 +457,60 @@ public class SubscriptionManager {
/** Indicates that data roaming is disabled for a subscription */
public static final int DATA_ROAMING_DISABLE = SimInfo.DATA_ROAMING_DISABLE;
/** @hide */
public static final int DATA_ROAMING_DEFAULT = SimInfo.DATA_ROAMING_DEFAULT;
/**
* TelephonyProvider column name for subscription carrier id.
* @see TelephonyManager#getSimCarrierId()
* <p>Type: INTEGER (int) </p>
* @hide
*/
public static final String CARRIER_ID = SimInfo.CARRIER_ID;
public static final String CARRIER_ID = SimInfo.COLUMN_CARRIER_ID;
/**
* @hide A comma-separated list of EHPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*/
public static final String EHPLMNS = SimInfo.EHPLMNS;
public static final String EHPLMNS = SimInfo.COLUMN_EHPLMNS;
/**
* @hide A comma-separated list of HPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*/
public static final String HPLMNS = SimInfo.HPLMNS;
public static final String HPLMNS = SimInfo.COLUMN_HPLMNS;
/**
* TelephonyProvider column name for the MCC associated with a SIM, stored as a string.
* <P>Type: TEXT (String)</P>
* @hide
*/
public static final String MCC_STRING = SimInfo.MCC_STRING;
public static final String MCC_STRING = SimInfo.COLUMN_MCC_STRING;
/**
* TelephonyProvider column name for the MNC associated with a SIM, stored as a string.
* <P>Type: TEXT (String)</P>
* @hide
*/
public static final String MNC_STRING = SimInfo.MNC_STRING;
public static final String MNC_STRING = SimInfo.COLUMN_MNC_STRING;
/**
* TelephonyProvider column name for the MCC associated with a SIM.
* <P>Type: INTEGER (int)</P>
* @hide
*/
public static final String MCC = SimInfo.MCC;
public static final String MCC = SimInfo.COLUMN_MCC;
/**
* TelephonyProvider column name for the MNC associated with a SIM.
* <P>Type: INTEGER (int)</P>
* @hide
*/
public static final String MNC = SimInfo.MNC;
public static final String MNC = SimInfo.COLUMN_MNC;
/**
* TelephonyProvider column name for the iso country code associated with a SIM.
* <P>Type: TEXT (String)</P>
* @hide
*/
public static final String ISO_COUNTRY_CODE = SimInfo.ISO_COUNTRY_CODE;
public static final String ISO_COUNTRY_CODE = SimInfo.COLUMN_ISO_COUNTRY_CODE;
/**
* TelephonyProvider column name for whether a subscription is embedded (that is, present on an
@@ -519,7 +518,7 @@ public class SubscriptionManager {
* <p>Type: INTEGER (int), 1 for embedded or 0 for non-embedded.
* @hide
*/
public static final String IS_EMBEDDED = SimInfo.IS_EMBEDDED;
public static final String IS_EMBEDDED = SimInfo.COLUMN_IS_EMBEDDED;
/**
* TelephonyProvider column name for SIM card identifier. For UICC card it is the ICCID of the
@@ -527,7 +526,7 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
* @hide
*/
public static final String CARD_ID = SimInfo.CARD_ID;
public static final String CARD_ID = SimInfo.COLUMN_CARD_ID;
/**
* TelephonyProvider column name for the encoded {@link UiccAccessRule}s from
@@ -535,7 +534,7 @@ public class SubscriptionManager {
* <p>TYPE: BLOB
* @hide
*/
public static final String ACCESS_RULES = SimInfo.ACCESS_RULES;
public static final String ACCESS_RULES = SimInfo.COLUMN_ACCESS_RULES;
/**
* TelephonyProvider column name for the encoded {@link UiccAccessRule}s from
@@ -545,7 +544,7 @@ public class SubscriptionManager {
* @hide
*/
public static final String ACCESS_RULES_FROM_CARRIER_CONFIGS =
SimInfo.ACCESS_RULES_FROM_CARRIER_CONFIGS;
SimInfo.COLUMN_ACCESS_RULES_FROM_CARRIER_CONFIGS;
/**
* TelephonyProvider column name identifying whether an embedded subscription is on a removable
@@ -555,79 +554,82 @@ public class SubscriptionManager {
* <p>TYPE: INTEGER (int), 1 for removable or 0 for non-removable.
* @hide
*/
public static final String IS_REMOVABLE = SimInfo.IS_REMOVABLE;
public static final String IS_REMOVABLE = SimInfo.COLUMN_IS_REMOVABLE;
/**
* TelephonyProvider column name for extreme threat in CB settings
* @hide
*/
public static final String CB_EXTREME_THREAT_ALERT = SimInfo.CB_EXTREME_THREAT_ALERT;
public static final String CB_EXTREME_THREAT_ALERT =
SimInfo.COLUMN_CB_EXTREME_THREAT_ALERT;
/**
* TelephonyProvider column name for severe threat in CB settings
*@hide
*/
public static final String CB_SEVERE_THREAT_ALERT = SimInfo.CB_SEVERE_THREAT_ALERT;
public static final String CB_SEVERE_THREAT_ALERT = SimInfo.COLUMN_CB_SEVERE_THREAT_ALERT;
/**
* TelephonyProvider column name for amber alert in CB settings
*@hide
*/
public static final String CB_AMBER_ALERT = SimInfo.CB_AMBER_ALERT;
public static final String CB_AMBER_ALERT = SimInfo.COLUMN_CB_AMBER_ALERT;
/**
* TelephonyProvider column name for emergency alert in CB settings
*@hide
*/
public static final String CB_EMERGENCY_ALERT = SimInfo.CB_EMERGENCY_ALERT;
public static final String CB_EMERGENCY_ALERT = SimInfo.COLUMN_CB_EMERGENCY_ALERT;
/**
* TelephonyProvider column name for alert sound duration in CB settings
*@hide
*/
public static final String CB_ALERT_SOUND_DURATION = SimInfo.CB_ALERT_SOUND_DURATION;
public static final String CB_ALERT_SOUND_DURATION =
SimInfo.COLUMN_CB_ALERT_SOUND_DURATION;
/**
* TelephonyProvider column name for alert reminder interval in CB settings
*@hide
*/
public static final String CB_ALERT_REMINDER_INTERVAL = SimInfo.CB_ALERT_REMINDER_INTERVAL;
public static final String CB_ALERT_REMINDER_INTERVAL =
SimInfo.COLUMN_CB_ALERT_REMINDER_INTERVAL;
/**
* TelephonyProvider column name for enabling vibrate in CB settings
*@hide
*/
public static final String CB_ALERT_VIBRATE = SimInfo.CB_ALERT_VIBRATE;
public static final String CB_ALERT_VIBRATE = SimInfo.COLUMN_CB_ALERT_VIBRATE;
/**
* TelephonyProvider column name for enabling alert speech in CB settings
*@hide
*/
public static final String CB_ALERT_SPEECH = SimInfo.CB_ALERT_SPEECH;
public static final String CB_ALERT_SPEECH = SimInfo.COLUMN_CB_ALERT_SPEECH;
/**
* TelephonyProvider column name for ETWS test alert in CB settings
*@hide
*/
public static final String CB_ETWS_TEST_ALERT = SimInfo.CB_ETWS_TEST_ALERT;
public static final String CB_ETWS_TEST_ALERT = SimInfo.COLUMN_CB_ETWS_TEST_ALERT;
/**
* TelephonyProvider column name for enable channel50 alert in CB settings
*@hide
*/
public static final String CB_CHANNEL_50_ALERT = SimInfo.CB_CHANNEL_50_ALERT;
public static final String CB_CHANNEL_50_ALERT = SimInfo.COLUMN_CB_CHANNEL_50_ALERT;
/**
* TelephonyProvider column name for CMAS test alert in CB settings
*@hide
*/
public static final String CB_CMAS_TEST_ALERT = SimInfo.CB_CMAS_TEST_ALERT;
public static final String CB_CMAS_TEST_ALERT = SimInfo.COLUMN_CB_CMAS_TEST_ALERT;
/**
* TelephonyProvider column name for Opt out dialog in CB settings
*@hide
*/
public static final String CB_OPT_OUT_DIALOG = SimInfo.CB_OPT_OUT_DIALOG;
public static final String CB_OPT_OUT_DIALOG = SimInfo.COLUMN_CB_OPT_OUT_DIALOG;
/**
* TelephonyProvider column name for enable Volte.
@@ -636,44 +638,45 @@ public class SubscriptionManager {
* {@link CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}.
*@hide
*/
public static final String ENHANCED_4G_MODE_ENABLED = SimInfo.ENHANCED_4G_MODE_ENABLED;
public static final String ENHANCED_4G_MODE_ENABLED =
SimInfo.COLUMN_ENHANCED_4G_MODE_ENABLED;
/**
* TelephonyProvider column name for enable VT (Video Telephony over IMS)
*@hide
*/
public static final String VT_IMS_ENABLED = SimInfo.VT_IMS_ENABLED;
public static final String VT_IMS_ENABLED = SimInfo.COLUMN_VT_IMS_ENABLED;
/**
* TelephonyProvider column name for enable Wifi calling
*@hide
*/
public static final String WFC_IMS_ENABLED = SimInfo.WFC_IMS_ENABLED;
public static final String WFC_IMS_ENABLED = SimInfo.COLUMN_WFC_IMS_ENABLED;
/**
* TelephonyProvider column name for Wifi calling mode
*@hide
*/
public static final String WFC_IMS_MODE = SimInfo.WFC_IMS_MODE;
public static final String WFC_IMS_MODE = SimInfo.COLUMN_WFC_IMS_MODE;
/**
* TelephonyProvider column name for Wifi calling mode in roaming
*@hide
*/
public static final String WFC_IMS_ROAMING_MODE = SimInfo.WFC_IMS_ROAMING_MODE;
public static final String WFC_IMS_ROAMING_MODE = SimInfo.COLUMN_WFC_IMS_ROAMING_MODE;
/**
* TelephonyProvider column name for enable Wifi calling in roaming
*@hide
*/
public static final String WFC_IMS_ROAMING_ENABLED = SimInfo.WFC_IMS_ROAMING_ENABLED;
public static final String WFC_IMS_ROAMING_ENABLED = SimInfo.COLUMN_WFC_IMS_ROAMING_ENABLED;
/**
* Determines if the user has enabled IMS RCS User Capability Exchange (UCE) for this
* subscription.
* @hide
*/
public static final String IMS_RCS_UCE_ENABLED = SimInfo.IMS_RCS_UCE_ENABLED;
public static final String IMS_RCS_UCE_ENABLED = SimInfo.COLUMN_IMS_RCS_UCE_ENABLED;
/**
* TelephonyProvider column name for whether a subscription is opportunistic, that is,
@@ -682,7 +685,7 @@ public class SubscriptionManager {
* <p>Type: INTEGER (int), 1 for opportunistic or 0 for non-opportunistic.
* @hide
*/
public static final String IS_OPPORTUNISTIC = SimInfo.IS_OPPORTUNISTIC;
public static final String IS_OPPORTUNISTIC = SimInfo.COLUMN_IS_OPPORTUNISTIC;
/**
* TelephonyProvider column name for group ID. Subscriptions with same group ID
@@ -691,7 +694,7 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String GROUP_UUID = SimInfo.GROUP_UUID;
public static final String GROUP_UUID = SimInfo.COLUMN_GROUP_UUID;
/**
* TelephonyProvider column name for group owner. It's the package name who created
@@ -699,7 +702,7 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String GROUP_OWNER = SimInfo.GROUP_OWNER;
public static final String GROUP_OWNER = SimInfo.COLUMN_GROUP_OWNER;
/**
* TelephonyProvider column name for the profile class of a subscription
@@ -707,7 +710,7 @@ public class SubscriptionManager {
* <P>Type: INTEGER (int)</P>
* @hide
*/
public static final String PROFILE_CLASS = SimInfo.PROFILE_CLASS;
public static final String PROFILE_CLASS = SimInfo.COLUMN_PROFILE_CLASS;
/**
* Profile class of the subscription
@@ -719,7 +722,6 @@ public class SubscriptionManager {
SimInfo.PROFILE_CLASS_PROVISIONING,
SimInfo.PROFILE_CLASS_OPERATIONAL,
SimInfo.PROFILE_CLASS_UNSET,
SimInfo.PROFILE_CLASS_DEFAULT
})
public @interface ProfileClass {}
@@ -765,7 +767,8 @@ public class SubscriptionManager {
* @hide
*/
@SystemApi
public static final int PROFILE_CLASS_DEFAULT = SimInfo.PROFILE_CLASS_DEFAULT;
@Deprecated
public static final int PROFILE_CLASS_DEFAULT = SimInfo.PROFILE_CLASS_UNSET;
/**
* IMSI (International Mobile Subscriber Identity).
@@ -773,19 +776,19 @@ public class SubscriptionManager {
* @hide
*/
//TODO: add @SystemApi
public static final String IMSI = SimInfo.IMSI;
public static final String IMSI = SimInfo.COLUMN_IMSI;
/**
* Whether uicc applications is set to be enabled or disabled. By default it's enabled.
* @hide
*/
public static final String UICC_APPLICATIONS_ENABLED = SimInfo.UICC_APPLICATIONS_ENABLED;
public static final String UICC_APPLICATIONS_ENABLED = SimInfo.COLUMN_UICC_APPLICATIONS_ENABLED;
/**
* Indicate which network type is allowed. By default it's enabled.
* @hide
*/
public static final String ALLOWED_NETWORK_TYPES = SimInfo.ALLOWED_NETWORK_TYPES;
public static final String ALLOWED_NETWORK_TYPES = SimInfo.COLUMN_ALLOWED_NETWORK_TYPES;
/**
* Broadcast Action: The user has changed one of the default subs related to