diff options
author | Jorim Jaggi <jjaggi@google.com> | 2015-07-10 21:16:24 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-10 21:16:26 +0000 |
commit | 0c758805b385a5c136b21a2b38e2383c30665282 (patch) | |
tree | 127a4aa218914c23b53c97fbf31a230262109dea /packages | |
parent | 256642aa2f7045552d474d814323e9eb5b486113 (diff) | |
parent | 4474f54f4eedbdf5d0b225647d50c0b05466a448 (diff) | |
download | frameworks_base-0c758805b385a5c136b21a2b38e2383c30665282.zip frameworks_base-0c758805b385a5c136b21a2b38e2383c30665282.tar.gz frameworks_base-0c758805b385a5c136b21a2b38e2383c30665282.tar.bz2 |
Merge "Fix empty keyguard for once and all" into mnc-dev
Diffstat (limited to 'packages')
-rw-r--r-- | packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 7f61fc1..009a0d6 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -253,6 +253,7 @@ public class KeyguardViewMediator extends SystemUI { private KeyguardUpdateMonitor mUpdateMonitor; private boolean mDeviceInteractive; + private boolean mGoingToSleep; // last known state of the cellular connection private String mPhoneState = TelephonyManager.EXTRA_STATE_IDLE; @@ -639,6 +640,7 @@ public class KeyguardViewMediator extends SystemUI { if (DEBUG) Log.d(TAG, "onStartedGoingToSleep(" + why + ")"); synchronized (this) { mDeviceInteractive = false; + mGoingToSleep = true; // Lock immediately based on setting if secure (user has a pin/pattern/password). // This also "locks" the device when not secure to provide easy access to the @@ -678,6 +680,7 @@ public class KeyguardViewMediator extends SystemUI { if (DEBUG) Log.d(TAG, "onFinishedGoingToSleep(" + why + ")"); synchronized (this) { mDeviceInteractive = false; + mGoingToSleep = false; resetKeyguardDonePendingLocked(); mHideAnimationRun = false; @@ -1239,6 +1242,10 @@ public class KeyguardViewMediator extends SystemUI { } mUpdateMonitor.clearFingerprintRecognized(); + if (mGoingToSleep) { + Log.i(TAG, "Device is going to sleep, aborting keyguardDone"); + return; + } if (mExitSecureCallback != null) { try { mExitSecureCallback.onKeyguardExitResult(authenticated); |