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

Commit cabb1d47 authored by vivi.li's avatar vivi.li
Browse files

DUT fail to unlock SIM after selecting Home IMSI from STK When unlock SIM pin,SIM begin refresh, 

and the UiccCardApp was disposed.

But the unlock process was canceled. Therefore,
the previous unlocking process was interrupted without returning,
and the keyguard PIN lock View was always displayed.
If UiccCardApp was disposed,send the CommandException.Error.ABORTED as result for the previous Message.

Test: manual
Bug:140907125

Change-Id: I61f63136cb8638566f612a0a459adb398294527f
parent d72172d5

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
@@ -111,6 +111,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>