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

Merge "[Telephony Mainline] Expose APIs in SubscriptionManager"

Browse Source
This commit is contained in:
Treehugger Robot
2020-01-24 18:31:32 +00:00
committed by Gerrit Code Review
parent e021269f8d 78af57db36
commit c0e02ab436
6 changed files with 564 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
api/system-current.txt
View File

@@ -7179,7 +7179,71 @@ package android.provider {
}
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 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 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 {

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

@@ -81,7 +81,6 @@ import android.os.ServiceManager;
import android.os.UserHandle;
import android.provider.SettingsValidators.Validator;
import android.speech.tts.TextToSpeech;
import android.telephony.SubscriptionManager;
import android.text.TextUtils;
import android.util.AndroidException;
import android.util.ArrayMap;
@@ -13321,16 +13320,17 @@ public final class Settings {
/**
* Whether the Volte is enabled. If this setting is not set then we use the Carrier Config
* value {@link CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}.
* value
* {@link android.telephony.CarrierConfigManager#KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL}.
* <p>
* Type: int (0 for false, 1 for true)
* @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#ENHANCED_4G_MODE_ENABLED}
* @deprecated Use {@link android.provider.Telephony.SimInfo#ENHANCED_4G_MODE_ENABLED}
* instead.
*/
@Deprecated
public static final String ENHANCED_4G_MODE_ENABLED =
SubscriptionManager.ENHANCED_4G_MODE_ENABLED;
Telephony.SimInfo.ENHANCED_4G_MODE_ENABLED;
/**
* Whether VT (Video Telephony over IMS) is enabled
@@ -13338,10 +13338,10 @@ public final class Settings {
* Type: int (0 for false, 1 for true)
*
* @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#VT_IMS_ENABLED} instead.
* @deprecated Use {@link android.provider.Telephony.SimInfo#VT_IMS_ENABLED} instead.
*/
@Deprecated
public static final String VT_IMS_ENABLED = SubscriptionManager.VT_IMS_ENABLED;
public static final String VT_IMS_ENABLED = Telephony.SimInfo.VT_IMS_ENABLED;
/**
* Whether WFC is enabled
@@ -13349,10 +13349,10 @@ public final class Settings {
* Type: int (0 for false, 1 for true)
*
* @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ENABLED} instead.
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_ENABLED} instead.
*/
@Deprecated
public static final String WFC_IMS_ENABLED = SubscriptionManager.WFC_IMS_ENABLED;
public static final String WFC_IMS_ENABLED = Telephony.SimInfo.WFC_IMS_ENABLED;
/**
* WFC mode on home/non-roaming network.
@@ -13360,10 +13360,10 @@ public final class Settings {
* Type: int - 2=Wi-Fi preferred, 1=Cellular preferred, 0=Wi-Fi only
*
* @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_MODE} instead.
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_MODE} instead.
*/
@Deprecated
public static final String WFC_IMS_MODE = SubscriptionManager.WFC_IMS_MODE;
public static final String WFC_IMS_MODE = Telephony.SimInfo.WFC_IMS_MODE;
/**
* WFC mode on roaming network.
@@ -13371,11 +13371,11 @@ public final class Settings {
* Type: int - see {@link #WFC_IMS_MODE} for values
*
* @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ROAMING_MODE}
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_ROAMING_MODE}
* instead.
*/
@Deprecated
public static final String WFC_IMS_ROAMING_MODE = SubscriptionManager.WFC_IMS_ROAMING_MODE;
public static final String WFC_IMS_ROAMING_MODE = Telephony.SimInfo.WFC_IMS_ROAMING_MODE;
/**
* Whether WFC roaming is enabled
@@ -13383,12 +13383,12 @@ public final class Settings {
* Type: int (0 for false, 1 for true)
*
* @hide
* @deprecated Use {@link android.telephony.SubscriptionManager#WFC_IMS_ROAMING_ENABLED}
* @deprecated Use {@link android.provider.Telephony.SimInfo#WFC_IMS_ROAMING_ENABLED}
* instead
*/
@Deprecated
public static final String WFC_IMS_ROAMING_ENABLED =
SubscriptionManager.WFC_IMS_ROAMING_ENABLED;
Telephony.SimInfo.WFC_IMS_ROAMING_ENABLED;
/**
* Whether user can enable/disable LTE as a preferred network. A carrier might control

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

@@ -37,11 +37,13 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Parcel;
import android.telephony.CarrierConfigManager;
import android.telephony.Rlog;
import android.telephony.ServiceState;
import android.telephony.SmsMessage;
import android.telephony.SubscriptionManager;
import android.telephony.TelephonyManager;
import android.telephony.UiccAccessRule;
import android.text.TextUtils;
import android.util.Patterns;
@@ -4928,5 +4930,402 @@ public final class Telephony {
*/
@NonNull
public static final Uri CONTENT_URI = Uri.parse("content://telephony/siminfo");
/**
* TelephonyProvider unique key column name is the subscription id.
* <P>Type: TEXT (String)</P>
*/
public static final String 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>
*/
public static final String ICC_ID = "icc_id";
/**
* TelephonyProvider column name for user SIM_SlOT_INDEX
* <P>Type: INTEGER (int)</P>
*/
public static final String SIM_SLOT_INDEX = "sim_id";
/**
* SIM is not inserted
*/
public static final int SIM_NOT_INSERTED = -1;
/**
* TelephonyProvider column name Subscription-type.
* <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.
*/
public static final String 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>
*/
public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0;
/**
* This constant is to designate a subscription as a Remote-SIM Subscription.
* <p>
* A Remote-SIM subscription is for a SIM on a phone connected to this device via some
* connectivity mechanism, for example bluetooth. Similar to Local SIM, this subscription
* can be used for SMS, Voice and data by proxying data through the connected device.
* Certain data of the SIM, such as IMEI, are not accessible for Remote SIMs.
* </p>
*
* <p>
* A Remote-SIM is available only as long the phone stays connected to this device.
* When the phone disconnects, Remote-SIM subscription is removed from this device and is
* no longer known. All data associated with the subscription, such as stored SMS, call
* logs, contacts etc, are removed from this device.
* </p>
*
* <p>
* If the phone re-connects to this device, a new Remote-SIM subscription is created for
* the phone. The Subscription Id associated with the new subscription is different from
* the Subscription Id of the previous Remote-SIM subscription created (and removed) for the
* phone; i.e., new Remote-SIM subscription treats the reconnected phone as a Remote-SIM
* that was never seen before.
* </p>
*/
public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1;
/**
* TelephonyProvider column name data_enabled_override_rules.
* It's a list of rules for overriding data enabled settings. The syntax is
* For example, "mms=nonDefault" indicates enabling data for mms in non-default
* subscription.
* "default=nonDefault&inVoiceCall" indicates enabling data for internet in non-default
* subscription and while is in voice call.
*
* Default value is empty string.
*/
public static final String DATA_ENABLED_OVERRIDE_RULES = "data_enabled_override_rules";
/**
* TelephonyProvider column name for user displayed name.
* <P>Type: TEXT (String)</P>
*/
public static final String DISPLAY_NAME = "display_name";
/**
* TelephonyProvider column name for the service provider name for the SIM.
* <P>Type: TEXT (String)</P>
*/
public static final String 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
*/
public static final String 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 SIM EF_SPN.
*/
public static final int NAME_SOURCE_SIM_SPN = 1;
/**
* The name_source is from user input
*/
public static final int NAME_SOURCE_USER_INPUT = 2;
/**
* The name_source is carrier (carrier app, carrier config, etc.)
*/
public static final int NAME_SOURCE_CARRIER = 3;
/**
* The name_source is from SIM EF_PNN.
*/
public static final int NAME_SOURCE_SIM_PNN = 4;
/**
* TelephonyProvider column name for the color of a SIM.
* <P>Type: INTEGER (int)</P>
*/
public static final String COLOR = "color";
/** TelephonyProvider column name for 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>
*/
public static final String 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";
/**
* TelephonyProvider column name for the default display format of a SIM
* @hide
*/
public static final int DISPLAY_NUMBER_DEFAULT = 1;
/**
* TelephonyProvider column name for whether data roaming is enabled.
* <P>Type: INTEGER (int)</P>
*/
public static final String DATA_ROAMING = "data_roaming";
/** Indicates that data roaming is enabled for a subscription */
public static final int DATA_ROAMING_ENABLE = 1;
/** Indicates that data roaming is disabled for a subscription */
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>
*/
public static final String CARRIER_ID = "carrier_id";
/**
* A comma-separated list of EHPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*/
public static final String EHPLMNS = "ehplmns";
/**
* A comma-separated list of HPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*/
public static final String HPLMNS = "hplmns";
/**
* TelephonyProvider column name for the MCC associated with a SIM, stored as a string.
* <P>Type: TEXT (String)</P>
*/
public static final String MCC_STRING = "mcc_string";
/**
* TelephonyProvider column name for the MNC associated with a SIM, stored as a string.
* <P>Type: TEXT (String)</P>
*/
public static final String MNC_STRING = "mnc_string";
/**
* TelephonyProvider column name for the MCC associated with a SIM.
* <P>Type: INTEGER (int)</P>
*/
public static final String MCC = "mcc";
/**
* TelephonyProvider column name for the MNC associated with a SIM.
* <P>Type: INTEGER (int)</P>
*/
public static final String MNC = "mnc";
/**
* TelephonyProvider column name for the iso country code associated with a SIM.
* <P>Type: TEXT (String)</P>
*/
public static final String 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";
/** The sim is provisioned {@hide} */
public static final int SIM_PROVISIONED = 0;
/**
* 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.
*/
public static final String 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>
*/
public static final String 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.
* <p>TYPE: BLOB
*/
public static final String 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
*/
public static final String 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.
* <p>TYPE: INTEGER (int), 1 for removable or 0 for non-removable.
*/
public static final String 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 severe threat in CB settings */
public static final String 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 emergency alert in CB settings */
public static final String 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 reminder interval in CB settings */
public static final String 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 alert speech in CB settings */
public static final String 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 enable channel50 alert in CB settings */
public static final String 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 Opt out dialog in CB settings */
public static final String 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}.
*/
public static final String 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 Wifi calling */
public static final String 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 in roaming */
public static final String 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 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.
*/
public static final String 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.
*/
public static final String GROUP_UUID = "group_uuid";
/**
* TelephonyProvider column name for group owner. It's the package name who created
* the subscription group.
*/
public static final String 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";
/**
* TelephonyProvider column name for the profile class of a subscription
* Only present if {@link #IS_EMBEDDED} is 1.
* <P>Type: INTEGER (int)</P>
*/
public static final String 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.
*/
public static final int PROFILE_CLASS_TESTING = 0;
/**
* A provisioning profile is pre-loaded onto the eUICC and
* provides connectivity to a mobile network solely for the
* purpose of provisioning profiles.
*/
public static final int PROFILE_CLASS_PROVISIONING = 1;
/**
* An operational profile can be pre-loaded or downloaded
* onto the eUICC and provides services provided by the
* operator.
*/
public static final int PROFILE_CLASS_OPERATIONAL = 2;
/**
* 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.
*/
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>
*/
public static final String 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";
}
}

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_SOURCE;
import static android.telephony.SubscriptionManager.NAME_SOURCE_DEFAULT;
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_SOURCE, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_DEFAULT, 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_SOURCE, 0xFFFFFF, "", DATA_ROAMING_DISABLE,
TEST_CARRIER, null, NAME_SOURCE_DEFAULT, 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_SOURCE, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_DEFAULT, 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_SOURCE;
import static android.telephony.SubscriptionManager.NAME_SOURCE_DEFAULT;
import static com.google.common.truth.Truth.assertThat;
@@ -84,11 +84,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_SOURCE, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER, NAME_SOURCE_DEFAULT, 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_SOURCE, 0xFFFFFF, "",
TEST_CARRIER, TEST_CARRIER_2, NAME_SOURCE_DEFAULT, 0xFFFFFF, "",
DATA_ROAMING_DISABLE, null, null, null, null, false, null, "", true, TEST_GROUP_UUID,
TEST_CARRIER_ID, 0);
@Mock

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

@@ -266,7 +266,7 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String UNIQUE_KEY_SUBSCRIPTION_ID = "_id";
public static final String UNIQUE_KEY_SUBSCRIPTION_ID = SimInfo.UNIQUE_KEY_SUBSCRIPTION_ID;
/**
* TelephonyProvider column name for a unique identifier for the subscription within the
@@ -275,18 +275,18 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
*/
/** @hide */
public static final String ICC_ID = "icc_id";
public static final String ICC_ID = SimInfo.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 SIM_SLOT_INDEX = SimInfo.SIM_SLOT_INDEX;
/** SIM is not inserted */
/** @hide */
public static final int SIM_NOT_INSERTED = -1;
public static final int SIM_NOT_INSERTED = SimInfo.SIM_NOT_INSERTED;
/**
* The slot-index for Bluetooth Remote-SIM subscriptions
@@ -301,23 +301,7 @@ public class SubscriptionManager {
* Default value is 0.
*/
/** @hide */
public static final String SUBSCRIPTION_TYPE = "subscription_type";
/**
* TelephonyProvider column name white_listed_apn_data.
* It's a bitmask of APN types that will be allowed on this subscription even if it's metered
* and mobile data is turned off by the user.
* <P>Type: INTEGER (int)</P> For example, if TYPE_MMS is is true, Telephony will allow MMS
* data connection to setup even if MMS is metered and mobile_data is turned off on that
* subscription.
*
* Default value is 0.
*
* @deprecated Replaced by {@link #DATA_ENABLED_OVERRIDE_RULES}
* @hide
*/
@Deprecated
public static final String WHITE_LISTED_APN_DATA = "white_listed_apn_data";
public static final String SUBSCRIPTION_TYPE = SimInfo.SUBSCRIPTION_TYPE;
/**
* TelephonyProvider column name data_enabled_override_rules.
@@ -330,7 +314,15 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String DATA_ENABLED_OVERRIDE_RULES = "data_enabled_override_rules";
public static final String DATA_ENABLED_OVERRIDE_RULES = SimInfo.DATA_ENABLED_OVERRIDE_RULES;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"SUBSCRIPTION_TYPE_"},
value = {
SUBSCRIPTION_TYPE_LOCAL_SIM,
SUBSCRIPTION_TYPE_REMOTE_SIM})
public @interface SubscriptionType {}
/**
* This constant is to designate a subscription as a Local-SIM Subscription.
@@ -338,7 +330,7 @@ public class SubscriptionManager {
* device.
* </p>
*/
public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0;
public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = SimInfo.SUBSCRIPTION_TYPE_LOCAL_SIM;
/**
* This constant is to designate a subscription as a Remote-SIM Subscription.
@@ -364,29 +356,21 @@ public class SubscriptionManager {
* was never seen before.
* </p>
*/
public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"SUBSCRIPTION_TYPE_"},
value = {
SUBSCRIPTION_TYPE_LOCAL_SIM,
SUBSCRIPTION_TYPE_REMOTE_SIM})
public @interface SubscriptionType {}
public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = SimInfo.SUBSCRIPTION_TYPE_REMOTE_SIM;
/**
* 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 DISPLAY_NAME = SimInfo.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 CARRIER_NAME = SimInfo.CARRIER_NAME;
/**
* Default name resource
@@ -400,44 +384,44 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String NAME_SOURCE = "name_source";
public static final String NAME_SOURCE = SimInfo.NAME_SOURCE;
/**
* The name_source is the default, which is from the carrier id.
* @hide
*/
public static final int NAME_SOURCE_DEFAULT_SOURCE = 0;
public static final int NAME_SOURCE_DEFAULT = SimInfo.NAME_SOURCE_DEFAULT;
/**
* The name_source is from SIM EF_SPN.
* @hide
*/
public static final int NAME_SOURCE_SIM_SPN = 1;
public static final int NAME_SOURCE_SIM_SPN = SimInfo.NAME_SOURCE_SIM_SPN;
/**
* The name_source is from user input
* @hide
*/
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
public static final int NAME_SOURCE_USER_INPUT = 2;
public static final int NAME_SOURCE_USER_INPUT = SimInfo.NAME_SOURCE_USER_INPUT;
/**
* The name_source is carrier (carrier app, carrier config, etc.)
* @hide
*/
public static final int NAME_SOURCE_CARRIER = 3;
public static final int NAME_SOURCE_CARRIER = SimInfo.NAME_SOURCE_CARRIER;
/**
* The name_source is from SIM EF_PNN.
* @hide
*/
public static final int NAME_SOURCE_SIM_PNN = 4;
public static final int NAME_SOURCE_SIM_PNN = SimInfo.NAME_SOURCE_SIM_PNN;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = {"NAME_SOURCE_"},
value = {
NAME_SOURCE_DEFAULT_SOURCE,
NAME_SOURCE_DEFAULT,
NAME_SOURCE_SIM_SPN,
NAME_SOURCE_USER_INPUT,
NAME_SOURCE_CARRIER,
@@ -450,67 +434,30 @@ public class SubscriptionManager {
* <P>Type: INTEGER (int)</P>
*/
/** @hide */
public static final String COLOR = "color";
/** @hide */
public static final int COLOR_1 = 0;
/** @hide */
public static final int COLOR_2 = 1;
/** @hide */
public static final int COLOR_3 = 2;
/** @hide */
public static final int COLOR_4 = 3;
/** @hide */
public static final int COLOR_DEFAULT = COLOR_1;
public static final String COLOR = SimInfo.COLOR;
/**
* 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 NUMBER = SimInfo.NUMBER;
/**
* TelephonyProvider column name for the number display format of a SIM.
* TelephonyProvider column name for whether data roaming is enabled.
* <P>Type: INTEGER (int)</P>
*/
/** @hide */
public static final String DISPLAY_NUMBER_FORMAT = "display_number_format";
/** @hide */
public static final int DISPLAY_NUMBER_NONE = 0;
/** @hide */
public static final int DISPLAY_NUMBER_FIRST = 1;
/** @hide */
public static final int DISPLAY_NUMBER_LAST = 2;
/** @hide */
public static final int DISPLAY_NUMBER_DEFAULT = DISPLAY_NUMBER_FIRST;
/**
* TelephonyProvider column name for permission for data roaming of a SIM.
* <P>Type: INTEGER (int)</P>
*/
/** @hide */
public static final String DATA_ROAMING = "data_roaming";
public static final String DATA_ROAMING = SimInfo.DATA_ROAMING;
/** Indicates that data roaming is enabled for a subscription */
public static final int DATA_ROAMING_ENABLE = 1;
public static final int DATA_ROAMING_ENABLE = SimInfo.DATA_ROAMING_ENABLE;
/** Indicates that data roaming is disabled for a subscription */
public static final int DATA_ROAMING_DISABLE = 0;
public static final int DATA_ROAMING_DISABLE = SimInfo.DATA_ROAMING_DISABLE;
/** @hide */
public static final int DATA_ROAMING_DEFAULT = DATA_ROAMING_DISABLE;
/** @hide */
public static final int SIM_PROVISIONED = 0;
public static final int DATA_ROAMING_DEFAULT = SimInfo.DATA_ROAMING_DEFAULT;
/**
* TelephonyProvider column name for subscription carrier id.
@@ -518,61 +465,61 @@ public class SubscriptionManager {
* <p>Type: INTEGER (int) </p>
* @hide
*/
public static final String CARRIER_ID = "carrier_id";
public static final String CARRIER_ID = SimInfo.CARRIER_ID;
/**
* @hide A comma-separated list of EHPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*/
public static final String EHPLMNS = "ehplmns";
public static final String EHPLMNS = SimInfo.EHPLMNS;
/**
* @hide A comma-separated list of HPLMNs associated with the subscription
* <P>Type: TEXT (String)</P>
*/
public static final String HPLMNS = "hplmns";
public static final String HPLMNS = SimInfo.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 MCC_STRING = SimInfo.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 MNC_STRING = SimInfo.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 MCC = SimInfo.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 MNC = SimInfo.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 ISO_COUNTRY_CODE = SimInfo.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 SIM_PROVISIONING_STATUS = SimInfo.SIM_PROVISIONING_STATUS;
/**
* TelephonyProvider column name for whether a subscription is embedded (that is, present on an
@@ -580,7 +527,7 @@ public class SubscriptionManager {
* <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 IS_EMBEDDED = SimInfo.IS_EMBEDDED;
/**
* TelephonyProvider column name for SIM card identifier. For UICC card it is the ICCID of the
@@ -588,7 +535,7 @@ public class SubscriptionManager {
* <P>Type: TEXT (String)</P>
* @hide
*/
public static final String CARD_ID = "card_id";
public static final String CARD_ID = SimInfo.CARD_ID;
/**
* TelephonyProvider column name for the encoded {@link UiccAccessRule}s from
@@ -596,7 +543,7 @@ public class SubscriptionManager {
* <p>TYPE: BLOB
* @hide
*/
public static final String ACCESS_RULES = "access_rules";
public static final String ACCESS_RULES = SimInfo.ACCESS_RULES;
/**
* TelephonyProvider column name for the encoded {@link UiccAccessRule}s from
@@ -606,7 +553,7 @@ public class SubscriptionManager {
* @hide
*/
public static final String ACCESS_RULES_FROM_CARRIER_CONFIGS =
"access_rules_from_carrier_configs";
SimInfo.ACCESS_RULES_FROM_CARRIER_CONFIGS;
/**
* TelephonyProvider column name identifying whether an embedded subscription is on a removable
@@ -616,79 +563,79 @@ public class SubscriptionManager {
* <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 IS_REMOVABLE = SimInfo.IS_REMOVABLE;
/**
* TelephonyProvider column name for extreme threat in CB settings
* @hide
*/
public static final String CB_EXTREME_THREAT_ALERT = "enable_cmas_extreme_threat_alerts";
public static final String CB_EXTREME_THREAT_ALERT = SimInfo.CB_EXTREME_THREAT_ALERT;
/**
* TelephonyProvider column name for severe threat in CB settings
*@hide
*/
public static final String CB_SEVERE_THREAT_ALERT = "enable_cmas_severe_threat_alerts";
public static final String CB_SEVERE_THREAT_ALERT = SimInfo.CB_SEVERE_THREAT_ALERT;
/**
* TelephonyProvider column name for amber alert in CB settings
*@hide
*/
public static final String CB_AMBER_ALERT = "enable_cmas_amber_alerts";
public static final String CB_AMBER_ALERT = SimInfo.CB_AMBER_ALERT;
/**
* TelephonyProvider column name for emergency alert in CB settings
*@hide
*/
public static final String CB_EMERGENCY_ALERT = "enable_emergency_alerts";
public static final String CB_EMERGENCY_ALERT = SimInfo.CB_EMERGENCY_ALERT;
/**
* TelephonyProvider column name for alert sound duration in CB settings
*@hide
*/
public static final String CB_ALERT_SOUND_DURATION = "alert_sound_duration";
public static final String CB_ALERT_SOUND_DURATION = SimInfo.CB_ALERT_SOUND_DURATION;
/**
* TelephonyProvider column name for alert reminder interval in CB settings
*@hide
*/
public static final String CB_ALERT_REMINDER_INTERVAL = "alert_reminder_interval";
public static final String CB_ALERT_REMINDER_INTERVAL = SimInfo.CB_ALERT_REMINDER_INTERVAL;
/**
* TelephonyProvider column name for enabling vibrate in CB settings
*@hide
*/
public static final String CB_ALERT_VIBRATE = "enable_alert_vibrate";
public static final String CB_ALERT_VIBRATE = SimInfo.CB_ALERT_VIBRATE;
/**
* TelephonyProvider column name for enabling alert speech in CB settings
*@hide
*/
public static final String CB_ALERT_SPEECH = "enable_alert_speech";
public static final String CB_ALERT_SPEECH = SimInfo.CB_ALERT_SPEECH;
/**
* TelephonyProvider column name for ETWS test alert in CB settings
*@hide
*/
public static final String CB_ETWS_TEST_ALERT = "enable_etws_test_alerts";
public static final String CB_ETWS_TEST_ALERT = SimInfo.CB_ETWS_TEST_ALERT;
/**
* TelephonyProvider column name for enable channel50 alert in CB settings
*@hide
*/
public static final String CB_CHANNEL_50_ALERT = "enable_channel_50_alerts";
public static final String CB_CHANNEL_50_ALERT = SimInfo.CB_CHANNEL_50_ALERT;
/**
* TelephonyProvider column name for CMAS test alert in CB settings
*@hide
*/
public static final String CB_CMAS_TEST_ALERT= "enable_cmas_test_alerts";
public static final String CB_CMAS_TEST_ALERT = SimInfo.CB_CMAS_TEST_ALERT;
/**
* TelephonyProvider column name for Opt out dialog in CB settings
*@hide
*/
public static final String CB_OPT_OUT_DIALOG = "show_cmas_opt_out_dialog";
public static final String CB_OPT_OUT_DIALOG = SimInfo.CB_OPT_OUT_DIALOG;
/**
* TelephonyProvider column name for enable Volte.
@@ -697,37 +644,37 @@ public class SubscriptionManager {
* {@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 ENHANCED_4G_MODE_ENABLED = SimInfo.ENHANCED_4G_MODE_ENABLED;
/**
* TelephonyProvider column name for enable VT (Video Telephony over IMS)
*@hide
*/
public static final String VT_IMS_ENABLED = "vt_ims_enabled";
public static final String VT_IMS_ENABLED = SimInfo.VT_IMS_ENABLED;
/**
* TelephonyProvider column name for enable Wifi calling
*@hide
*/
public static final String WFC_IMS_ENABLED = "wfc_ims_enabled";
public static final String WFC_IMS_ENABLED = SimInfo.WFC_IMS_ENABLED;
/**
* TelephonyProvider column name for Wifi calling mode
*@hide
*/
public static final String WFC_IMS_MODE = "wfc_ims_mode";
public static final String WFC_IMS_MODE = SimInfo.WFC_IMS_MODE;
/**
* TelephonyProvider column name for Wifi calling mode in roaming
*@hide
*/
public static final String WFC_IMS_ROAMING_MODE = "wfc_ims_roaming_mode";
public static final String WFC_IMS_ROAMING_MODE = SimInfo.WFC_IMS_ROAMING_MODE;
/**
* TelephonyProvider column name for enable Wifi calling in roaming
*@hide
*/
public static final String WFC_IMS_ROAMING_ENABLED = "wfc_ims_roaming_enabled";
public static final String WFC_IMS_ROAMING_ENABLED = SimInfo.WFC_IMS_ROAMING_ENABLED;
/**
* TelephonyProvider column name for whether a subscription is opportunistic, that is,
@@ -736,7 +683,7 @@ public class SubscriptionManager {
* <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 IS_OPPORTUNISTIC = SimInfo.IS_OPPORTUNISTIC;
/**
* TelephonyProvider column name for group ID. Subscriptions with same group ID
@@ -745,7 +692,7 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String GROUP_UUID = "group_uuid";
public static final String GROUP_UUID = SimInfo.GROUP_UUID;
/**
* TelephonyProvider column name for group owner. It's the package name who created
@@ -753,14 +700,7 @@ public class SubscriptionManager {
*
* @hide
*/
public static final String 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 GROUP_OWNER = SimInfo.GROUP_OWNER;
/**
* TelephonyProvider column name for the profile class of a subscription
@@ -768,7 +708,7 @@ public class SubscriptionManager {
* <P>Type: INTEGER (int)</P>
* @hide
*/
public static final String PROFILE_CLASS = "profile_class";
public static final String PROFILE_CLASS = SimInfo.PROFILE_CLASS;
/**
* Profile class of the subscription
@@ -776,11 +716,11 @@ public class SubscriptionManager {
*/
@Retention(RetentionPolicy.SOURCE)
@IntDef(prefix = { "PROFILE_CLASS_" }, value = {
PROFILE_CLASS_TESTING,
PROFILE_CLASS_PROVISIONING,
PROFILE_CLASS_OPERATIONAL,
PROFILE_CLASS_UNSET,
PROFILE_CLASS_DEFAULT
SimInfo.PROFILE_CLASS_TESTING,
SimInfo.PROFILE_CLASS_PROVISIONING,
SimInfo.PROFILE_CLASS_OPERATIONAL,
SimInfo.PROFILE_CLASS_UNSET,
SimInfo.PROFILE_CLASS_DEFAULT
})
public @interface ProfileClass {}
@@ -792,7 +732,7 @@ public class SubscriptionManager {
* @hide
*/
@SystemApi
public static final int PROFILE_CLASS_TESTING = 0;
public static final int PROFILE_CLASS_TESTING = SimInfo.PROFILE_CLASS_TESTING;
/**
* A provisioning profile is pre-loaded onto the eUICC and
@@ -801,7 +741,7 @@ public class SubscriptionManager {
* @hide
*/
@SystemApi
public static final int PROFILE_CLASS_PROVISIONING = 1;
public static final int PROFILE_CLASS_PROVISIONING = SimInfo.PROFILE_CLASS_PROVISIONING;
/**
* An operational profile can be pre-loaded or downloaded
@@ -810,7 +750,7 @@ public class SubscriptionManager {
* @hide
*/
@SystemApi
public static final int PROFILE_CLASS_OPERATIONAL = 2;
public static final int PROFILE_CLASS_OPERATIONAL = SimInfo.PROFILE_CLASS_OPERATIONAL;
/**
* The profile class is unset. This occurs when profile class
@@ -819,14 +759,14 @@ public class SubscriptionManager {
* @hide
*/
@SystemApi
public static final int PROFILE_CLASS_UNSET = -1;
public static final int PROFILE_CLASS_UNSET = SimInfo.PROFILE_CLASS_UNSET;
/**
* Default profile class
* @hide
*/
@SystemApi
public static final int PROFILE_CLASS_DEFAULT = PROFILE_CLASS_UNSET;
public static final int PROFILE_CLASS_DEFAULT = SimInfo.PROFILE_CLASS_DEFAULT;
/**
* IMSI (International Mobile Subscriber Identity).
@@ -834,13 +774,13 @@ public class SubscriptionManager {
* @hide
*/
//TODO: add @SystemApi
public static final String IMSI = "imsi";
public static final String IMSI = SimInfo.IMSI;
/**
* Whether uicc applications is set to be enabled or disabled. By default it's enabled.
* @hide
*/
public static final String UICC_APPLICATIONS_ENABLED = "uicc_applications_enabled";
public static final String UICC_APPLICATIONS_ENABLED = SimInfo.UICC_APPLICATIONS_ENABLED;
/**
* Broadcast Action: The user has changed one of the default subs related to