Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c9129642 authored by Patrick Huang's avatar Patrick Huang
Browse files

Add IntDef annotation to SIM state constants. 

Bug: 141227564
Test: Test build on device. Test calling affected TelephonyManager methods.
Change-Id: Ife159922b8b0fdf84ea376f32ac1d9156c9802d3
parent 700c836e

telephony/java/android/telephony/TelephonyManager.java

+27 −9
Original line number Diff line number Diff line
@@ -3026,6 +3026,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
@@ -3231,7 +3249,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;
@@ -3239,7 +3257,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
@@ -3273,7 +3291,7 @@ public class TelephonyManager { 
     * @hide

     */

    @SystemApi

    public int getSimCardState() {

    public @SimState int getSimCardState() {

        int simState = getSimState();

        return getSimCardStateFromSimState(simState);

    }
@@ -3293,7 +3311,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);

    }
@@ -3303,7 +3321,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:
@@ -3343,7 +3361,7 @@ public class TelephonyManager { 
     * @hide

     */

    @SystemApi

    public int getSimApplicationState() {

    public @SimState int getSimApplicationState() {

        int simState = getSimStateIncludingLoaded();

        return getSimApplicationStateFromSimState(simState);

    }
@@ -3366,7 +3384,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);
@@ -3377,7 +3395,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:
@@ -3434,7 +3452,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;