OSDN Git Service

Fix 5620754: don't show pattern screen after SIM PUK unlock
authorJim Miller <jaggies@google.com>
Fri, 18 Nov 2011 00:57:01 +0000 (16:57 -0800)
committerJim Miller <jaggies@google.com>
Fri, 18 Nov 2011 00:57:01 +0000 (16:57 -0800)
commit90d5d46b9e1bfc2df1a4a16b411eafb43c80eba5
tree478600783cc4f4ec031b5a0cdbb450fa05b64224
parent34a62348be92034a9fb7582e51754224785568dc
Fix 5620754: don't show pattern screen after SIM PUK unlock

This fixes a bug where we would inadvertently show the pattern
screen after PUK-unlocking the device.  Could potentially happen
after SIM unlock as well, but that path appears to be fast enough that
it's rarely seen.

The cause was not getting the SIM state change before deciding to show
the Unlock screen.

We now immediately invoke the callback if SIM/PUK unlock succeeds without
waiting for the round-trip from the radio layer.

Change-Id: I02dcb456da415b82f30f8e3abc43f788f3931b33
policy/src/com/android/internal/policy/impl/KeyguardUpdateMonitor.java
policy/src/com/android/internal/policy/impl/SimPukUnlockScreen.java
policy/src/com/android/internal/policy/impl/SimUnlockScreen.java