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

Add IntDef annotation to SIM state constants.

Browse Source 
Bug: 141227564
Test: Test build on device. Test calling affected TelephonyManager methods.
Change-Id: Ife159922b8b0fdf84ea376f32ac1d9156c9802d3
Merged-In: Ife159922b8b0fdf84ea376f32ac1d9156c9802d3
This commit is contained in:
Patrick Huang
2019-12-09 18:02:17 -08:00
parent 23019528ec
commit a5e2fee8a3
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2795,6 +2795,24 @@ public class TelephonyManager {
//
//
/** @hide */
@IntDef(prefix = {"SIM_STATE_"},
value = {
SIM_STATE_UNKNOWN,
SIM_STATE_ABSENT,
SIM_STATE_PIN_REQUIRED,
SIM_STATE_PUK_REQUIRED,
SIM_STATE_NETWORK_LOCKED,
SIM_STATE_READY,
SIM_STATE_NOT_READY,
SIM_STATE_PERM_DISABLED,
SIM_STATE_CARD_IO_ERROR,
SIM_STATE_CARD_RESTRICTED,
SIM_STATE_LOADED,
SIM_STATE_PRESENT,
})
public @interface SimState {}
/**
* SIM card state: Unknown. Signifies that the SIM is in transition
* between states. For example, when the user inputs the SIM pin
@@ -3000,7 +3018,7 @@ public class TelephonyManager {
* @see #SIM_STATE_CARD_IO_ERROR
* @see #SIM_STATE_CARD_RESTRICTED
*/
public int getSimState() {
public @SimState int getSimState() {
int simState = getSimStateIncludingLoaded();
if (simState == SIM_STATE_LOADED) {
simState = SIM_STATE_READY;
@@ -3008,7 +3026,7 @@ public class TelephonyManager {
return simState;
}
private int getSimStateIncludingLoaded() {
private @SimState int getSimStateIncludingLoaded() {
int slotIndex = getSlotIndex();
// slotIndex may be invalid due to sim being absent. In that case query all slots to get
// sim state
@@ -3042,7 +3060,7 @@ public class TelephonyManager {
* @hide
*/
@SystemApi
public int getSimCardState() {
public @SimState int getSimCardState() {
int simState = getSimState();
return getSimCardStateFromSimState(simState);
}
@@ -3062,7 +3080,7 @@ public class TelephonyManager {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public int getSimCardState(int physicalSlotIndex) {
public @SimState int getSimCardState(int physicalSlotIndex) {
int simState = getSimState(getLogicalSlotIndex(physicalSlotIndex));
return getSimCardStateFromSimState(simState);
}
@@ -3072,7 +3090,7 @@ public class TelephonyManager {
* @param simState
* @return SIM card state
*/
private int getSimCardStateFromSimState(int simState) {
private @SimState int getSimCardStateFromSimState(int simState) {
switch (simState) {
case SIM_STATE_UNKNOWN:
case SIM_STATE_ABSENT:
@@ -3112,7 +3130,7 @@ public class TelephonyManager {
* @hide
*/
@SystemApi
public int getSimApplicationState() {
public @SimState int getSimApplicationState() {
int simState = getSimStateIncludingLoaded();
return getSimApplicationStateFromSimState(simState);
}
@@ -3135,7 +3153,7 @@ public class TelephonyManager {
*/
@SystemApi
@RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE)
public int getSimApplicationState(int physicalSlotIndex) {
public @SimState int getSimApplicationState(int physicalSlotIndex) {
int simState =
SubscriptionManager.getSimStateForSlotIndex(getLogicalSlotIndex(physicalSlotIndex));
return getSimApplicationStateFromSimState(simState);
@@ -3146,7 +3164,7 @@ public class TelephonyManager {
* @param simState
* @return SIM application state
*/
private int getSimApplicationStateFromSimState(int simState) {
private @SimState int getSimApplicationStateFromSimState(int simState) {
switch (simState) {
case SIM_STATE_UNKNOWN:
case SIM_STATE_ABSENT:
@@ -3203,7 +3221,7 @@ public class TelephonyManager {
* @see #SIM_STATE_CARD_IO_ERROR
* @see #SIM_STATE_CARD_RESTRICTED
*/
public int getSimState(int slotIndex) {
public @SimState int getSimState(int slotIndex) {
int simState = SubscriptionManager.getSimStateForSlotIndex(slotIndex);
if (simState == SIM_STATE_LOADED) {
simState = SIM_STATE_READY;