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

Commit 15720f61 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Expose TelephonyManager constants as SystemApi"

parents 9681a661 f63f4dac

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -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_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

telephony/java/android/telephony/TelephonyManager.java

+14 −12
Original line number Diff line number Diff line
@@ -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;



    /**