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

Merge "Expose TelephonyManager constants as SystemApi"

Browse Source
This commit is contained in:
Sarah Chin
2020-01-16 22:17:32 +00:00
committed by Gerrit Code Review
parent 9681a661ae f63f4dac76
commit 15720f61d9
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
api/system-current.txt
View File

@@ -9324,6 +9324,9 @@ package android.telephony {
field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED"; field public static final String ACTION_SIM_APPLICATION_STATE_CHANGED = "android.telephony.action.SIM_APPLICATION_STATE_CHANGED";
field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED"; field public static final String ACTION_SIM_CARD_STATE_CHANGED = "android.telephony.action.SIM_CARD_STATE_CHANGED";
field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED"; field public static final String ACTION_SIM_SLOT_STATUS_CHANGED = "android.telephony.action.SIM_SLOT_STATUS_CHANGED";
field public static final int CARD_POWER_DOWN = 0; // 0x0
field public static final int CARD_POWER_UP = 1; // 0x1
field public static final int CARD_POWER_UP_PASS_THROUGH = 2; // 0x2
field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe field public static final int CARRIER_PRIVILEGE_STATUS_ERROR_LOADING_RULES = -2; // 0xfffffffe
field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1 field public static final int CARRIER_PRIVILEGE_STATUS_HAS_ACCESS = 1; // 0x1
field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0 field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0

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

@@ -9093,15 +9093,20 @@ public class TelephonyManager {
} }
/** /**
* Requested state of SIM
*
* CARD_POWER_DOWN
* Powers down the SIM. SIM must be up prior. * Powers down the SIM. SIM must be up prior.
* * @hide
* CARD_POWER_UP */
@SystemApi
public static final int CARD_POWER_DOWN = 0;
/**
* Powers up the SIM normally. SIM must be down prior. * Powers up the SIM normally. SIM must be down prior.
* * @hide
* CARD_POWER_UP_PASS_THROUGH */
@SystemApi
public static final int CARD_POWER_UP = 1;
/**
* Powers up the SIM in PASS_THROUGH mode. SIM must be down prior. * Powers up the SIM in PASS_THROUGH mode. SIM must be down prior.
* When SIM is powered up in PASS_THOUGH mode, the modem does not send * When SIM is powered up in PASS_THOUGH mode, the modem does not send
* any command to it (for example SELECT of MF, or TERMINAL CAPABILITY), * any command to it (for example SELECT of MF, or TERMINAL CAPABILITY),
@@ -9114,12 +9119,9 @@ public class TelephonyManager {
* is activated, and normal behavior occurs at the next SIM initialization, * is activated, and normal behavior occurs at the next SIM initialization,
* unless PASS_THROUGH mode is requested again. Hence, the last power-up mode * unless PASS_THROUGH mode is requested again. Hence, the last power-up mode
* is NOT persistent across boots. On reboot, SIM will power up normally. * is NOT persistent across boots. On reboot, SIM will power up normally.
* @hide
*/ */
/** @hide */ @SystemApi
public static final int CARD_POWER_DOWN = 0;
/** @hide */
public static final int CARD_POWER_UP = 1;
/** @hide */
public static final int CARD_POWER_UP_PASS_THROUGH = 2; public static final int CARD_POWER_UP_PASS_THROUGH = 2;
/** /**