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

Commit 46137cea authored by Amit Mahajan's avatar Amit Mahajan Committed by Automerger Merge Worker
Browse files

Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock... 

Merge "DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, and the UiccCardApp was disposed." am: 62120dcc am: 67bec2d7 am: 963957ed am: b166347b am: c7e11453

Change-Id: I9d696fa3a69173a355c6575b0da275caddc2b173
parents d6cd9427 c7e11453

telephony/java/android/telephony/PinResult.java

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public final class PinResult implements Parcelable { 
            PIN_RESULT_TYPE_SUCCESS,

            PIN_RESULT_TYPE_INCORRECT,

            PIN_RESULT_TYPE_FAILURE,

            PIN_RESULT_TYPE_ABORTED,

    })

    public @interface PinResultType {}
@@ -55,6 +56,11 @@ public final class PinResult implements Parcelable { 
     */

    public static final int PIN_RESULT_TYPE_FAILURE = PhoneConstants.PIN_GENERAL_FAILURE;



    /**

     * Indicates that the pin attempt was aborted.

     */

    public static final int PIN_RESULT_TYPE_ABORTED = PhoneConstants.PIN_OPERATION_ABORTED;



    private static final PinResult sFailedResult =

            new PinResult(PinResult.PIN_RESULT_TYPE_FAILURE, -1);

telephony/java/com/android/internal/telephony/PhoneConstants.java

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ public class PhoneConstants { 
    public static final int PIN_RESULT_SUCCESS = 0;

    public static final int PIN_PASSWORD_INCORRECT = 1;

    public static final int PIN_GENERAL_FAILURE = 2;

    public static final int PIN_OPERATION_ABORTED = 3;



    /**

     * Return codes for <code>enableApnType()</code>