summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Sarah Chin <sarahchin@google.com> 2020-01-14 23:27:53 -0800
committer Sarah Chin <sarahchin@google.com> 2020-01-16 16:10:58 +0000
commitf63f4dac76124951800406be50e99a347a489849 (patch)
tree926dc3884d0bb0ff9cf2659f7a8ff9daef97de44
parent719211525f5622d21a6fe25b22bddccafe66fa52 (diff)
Expose TelephonyManager constants as SystemApi
CARD_POWER_DOWN, CARD_POWER_UP, CARD_POWER_UP_PASS_THROUGH Test: lunch && make && make doc-comment-check-docs --> no compile errors Bug: 147611125 Change-Id: I2329e99ab7fc12ca71e057e2d5c639c43d4a6dd5
-rwxr-xr-xapi/system-current.txt3
-rw-r--r--telephony/java/android/telephony/TelephonyManager.java26
2 files changed, 17 insertions, 12 deletions
diff --git a/api/system-current.txt b/api/system-current.txt
index 4afb29b45a55..0fc8b311c5f1 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -9318,6 +9318,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_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 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_HAS_ACCESS = 1; // 0x1
field public static final int CARRIER_PRIVILEGE_STATUS_NO_ACCESS = 0; // 0x0
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 35b7313458cd..690393b52104 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -9093,15 +9093,20 @@ public class TelephonyManager {
}
/**
- * Requested state of SIM
- *
- * CARD_POWER_DOWN
* Powers down the SIM. SIM must be up prior.
- *
- * CARD_POWER_UP
+ * @hide
+ */
+ @SystemApi
+ public static final int CARD_POWER_DOWN = 0;
+
+ /**
* Powers up the SIM normally. SIM must be down prior.
- *
- * CARD_POWER_UP_PASS_THROUGH
+ * @hide
+ */
+ @SystemApi
+ public static final int CARD_POWER_UP = 1;
+
+ /**
* 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
* 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,
* 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.
+ * @hide
*/
- /** @hide */
- public static final int CARD_POWER_DOWN = 0;
- /** @hide */
- public static final int CARD_POWER_UP = 1;
- /** @hide */
+ @SystemApi
public static final int CARD_POWER_UP_PASS_THROUGH = 2;
/**