summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
diff options
context:
space:
mode:
authorSelim Cinek <cinek@google.com>2015-06-23 22:05:58 -0400
committerSelim Cinek <cinek@google.com>2015-06-24 12:52:19 -0400
commitedd32b881780e52b4ecc43f8df3b6b091e70a863 (patch)
tree3a1cf9c77750e97c429966efa0d114e98b6cf3d0 /packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
parent9a634991cf5fe5c8c44b643554330c87d7672e4a (diff)
downloadframeworks_base-edd32b881780e52b4ecc43f8df3b6b091e70a863.zip
frameworks_base-edd32b881780e52b4ecc43f8df3b6b091e70a863.tar.gz
frameworks_base-edd32b881780e52b4ecc43f8df3b6b091e70a863.tar.bz2
Fixed a bug with encryption where the keyguard was never shown with PIN
This led to the network being unusable. We now ensure that the Keyguard is not notified of the SIM PIN changes until after the initial dismissal logic is done. In addition, the fullscreen PIN is now always shown immediately and not until the user swipes up, which was an error before. Also made sure that the Keyguard Scrim is correctly visible when shown. Bug: 21850021 Change-Id: I81804124bae30adf0e17e26cc42f67e48fc446e8
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 80761d8..7f61fc1 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -622,9 +622,8 @@ public class KeyguardViewMediator extends SystemUI {
synchronized (this) {
if (DEBUG) Log.d(TAG, "onSystemReady");
mSystemReady = true;
- mUpdateMonitor.registerCallback(mUpdateCallback);
-
doKeyguardLocked(null);
+ mUpdateMonitor.registerCallback(mUpdateCallback);
}
// Most services aren't available until the system reaches the ready state, so we
// send it here when the device first boots.