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

Commit 193ecbf2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "remove SIM_ACTIVATION_RESPONSE_CODE from sysapi"

parents 2a123242 015a2ede

api/system-current.txt

+0 −5
Original line number Diff line number Diff line
@@ -42380,11 +42380,6 @@ package android.telephony { 
    field public static final int PHONE_TYPE_GSM = 1; // 0x1

    field public static final int PHONE_TYPE_NONE = 0; // 0x0

    field public static final int PHONE_TYPE_SIP = 3; // 0x3

    field public static final int SIM_ACTIVATION_RESULT_CANCELED = 4; // 0x4

    field public static final int SIM_ACTIVATION_RESULT_COMPLETE = 0; // 0x0

    field public static final int SIM_ACTIVATION_RESULT_FAILED = 3; // 0x3

    field public static final int SIM_ACTIVATION_RESULT_IN_PROGRESS = 2; // 0x2

    field public static final int SIM_ACTIVATION_RESULT_NOT_SUPPORTED = 1; // 0x1

    field public static final int SIM_STATE_ABSENT = 1; // 0x1

    field public static final int SIM_STATE_CARD_IO_ERROR = 8; // 0x8

    field public static final int SIM_STATE_CARD_RESTRICTED = 9; // 0x9

telephony/java/android/telephony/TelephonyManager.java

+0 −31
Original line number Diff line number Diff line
@@ -819,37 +819,6 @@ public class TelephonyManager { 
    public static final String EVENT_DOWNGRADE_DATA_DISABLED =

            "android.telephony.event.EVENT_DOWNGRADE_DATA_DISABLED";



    /**

     * Response codes for sim activation. Activation completed successfully.

     * @hide

     */

    @SystemApi

    public static final int SIM_ACTIVATION_RESULT_COMPLETE = 0;

    /**

     * Response codes for sim activation. Activation not supported (device has no SIM).

     * @hide

     */

    @SystemApi

    public static final int SIM_ACTIVATION_RESULT_NOT_SUPPORTED = 1;

    /**

     * Response codes for sim activation. Activation is in progress.

     * @hide

     */

    @SystemApi

    public static final int SIM_ACTIVATION_RESULT_IN_PROGRESS = 2;

    /**

     * Response codes for sim activation. Activation failed to complete.

     * @hide

     */

    @SystemApi

    public static final int SIM_ACTIVATION_RESULT_FAILED = 3;

    /**

     * Response codes for sim activation. Activation canceled by user.

     * @hide

     */

    @SystemApi

    public static final int SIM_ACTIVATION_RESULT_CANCELED = 4;



    /* Visual voicemail protocols */



    /**