commit 60121181f6dc9502b5e424cad587ab167922c1c0
author Yuling Liu <yuling.liu@sonymobile.com> Mon Aug 27 14:51:34 2012 +0800
committer Toshiya Ikenaga <toshiya.ikenaga@sonymobile.com> Tue Jul 12 11:07:42 2016 +0900
tree c7d6d4ef4241c3a0693ed73644a179792e7a1f05
parent fb00edac3dfebb18f664a8c658f32310923584b6

Fix: updateExternalState() does not update SIM state to PERM_DISABLED

setExternalState() shall be called with State.PERM_DISABLED if the state
of PIN1 is PinState.PINSTATE_ENABLED_PERM_BLOCKED. Refer to the same
logic in processLockedState().

Bug: 29864172
Change-Id: I68f6c62b3713520431177b041c23027e94a5d66b

src/java/com/android/internal/telephony/uicc/IccCardProxy.java

diff --git a/src/java/com/android/internal/telephony/uicc/IccCardProxy.java b/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
index ce8a671..19032c1 100644
--- a/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
+++ b/src/java/com/android/internal/telephony/uicc/IccCardProxy.java
@@ -419,6 +419,11 @@
                 setExternalState(State.PIN_REQUIRED);
                 break;
             case APPSTATE_PUK:
+                PinState pin1State = mUiccApplication.getPin1State();
+                if (pin1State.isPermBlocked()) {
+                    setExternalState(State.PERM_DISABLED);
+                    return;
+                }
                 setExternalState(State.PUK_REQUIRED);
                 break;
             case APPSTATE_SUBSCRIPTION_PERSO: