summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index b5fd73984a79..15f7a1219f3f 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -975,12 +975,6 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
mPowerGestureIntercepted = false;
mGoingToSleep = true;
- // Reset keyguard going away state so we can start listening for fingerprint. We
- // explicitly DO NOT want to call
- // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
- // here, since that will mess with the device lock state.
- mUpdateMonitor.dispatchKeyguardGoingAway(false);
-
// 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
// camera while preventing unwanted input.
@@ -1018,7 +1012,15 @@ public class KeyguardViewMediator extends SystemUI implements Dumpable,
playSounds(true);
}
}
+
mUpdateMonitor.dispatchStartedGoingToSleep(offReason);
+
+ // Reset keyguard going away state so we can start listening for fingerprint. We
+ // explicitly DO NOT want to call
+ // mKeyguardViewControllerLazy.get().setKeyguardGoingAwayState(false)
+ // here, since that will mess with the device lock state.
+ mUpdateMonitor.dispatchKeyguardGoingAway(false);
+
notifyStartedGoingToSleep();
}