Fix issue where AOD would not start

We shouldn't mix wakefulness with dream states, they come asynchronously
from different parts of the system. This means that the device might
not be GOING_TO_SLEEP when DozeService is started.
We also can't rely on wakefulness to drive Doze animations.

Test: unlock with fingerprint
Test: press power from launcher and lock screen multiple times
Fixes: 152835247
Change-Id: I3eaf2ae1801bbb999a6466c214234f33804ccf19

1 files changed, 5 insertions, 5 deletions

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
index fc29f5cddb26..2f103940f3e4 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardViewController.java
@@ -57,27 +57,27 @@ public interface KeyguardViewController {
     /**
      * Called when the device started going to sleep.
      */
-    void onStartedGoingToSleep();
+    default void onStartedGoingToSleep() {};
 
     /**
      * Called when the device has finished going to sleep.
      */
-    void onFinishedGoingToSleep();
+    default void onFinishedGoingToSleep() {};
 
     /**
      * Called when the device started waking up.
      */
-    void onStartedWakingUp();
+    default void onStartedWakingUp() {};
 
     /**
      * Called when the device started turning on.
      */
-    void onScreenTurningOn();
+    default void onScreenTurningOn() {};
 
     /**
      * Called when the device has finished turning on.
      */
-    void onScreenTurnedOn();
+    default void onScreenTurnedOn() {};
 
     /**
      * Sets whether the Keyguard needs input.