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: I941dc5ce8bc8ea903ddbe6b5fa88292636538107
diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index 7f58282..6ce15a8 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -1863,6 +1863,11 @@
((CommandException)(ar.exception)).getCommandError()
== CommandException.Error.PASSWORD_INCORRECT) {
mResult = PhoneConstants.PIN_PASSWORD_INCORRECT;
+ } //When UiccCardApp dispose,handle message and return exception
+ else if (ar.exception instanceof CommandException &&
+ ((CommandException) (ar.exception)).getCommandError()
+ == CommandException.Error.ABORTED) {
+ mResult = PhoneConstants.PIN_OPERATION_ABORTED;
} else {
mResult = PhoneConstants.PIN_GENERAL_FAILURE;
}