From cabb1d4761166fe9bfbd15b01e3fd9c4c416519c Mon Sep 17 00:00:00 2001 From: "vivi.li" Date: Tue, 7 Apr 2020 11:47:12 +0800 Subject: [PATCH] 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 --- telephony/java/android/telephony/PinResult.java | 6 ++++++ .../java/com/android/internal/telephony/PhoneConstants.java | 1 + 2 files changed, 7 insertions(+) diff --git a/telephony/java/android/telephony/PinResult.java b/telephony/java/android/telephony/PinResult.java index 68c9d998ba92b..d9b5de5f878a9 100644 --- a/telephony/java/android/telephony/PinResult.java +++ b/telephony/java/android/telephony/PinResult.java @@ -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); diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java index 6eea88f4c1033..db9fdf54852df 100644 --- a/telephony/java/com/android/internal/telephony/PhoneConstants.java +++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java @@ -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 enableApnType()