commit a1b09a92d8879f1f385046533628547a118eb558
author Craig Mautner <cmautner@google.com> Tue Mar 13 12:21:09 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Mar 13 12:21:09 2012 -0700
tree 9bacee06df45dcd64a69a1850004b5ebe66e6aa1
parent 53567a756e34706edbeae7217ad4205c55bb76b6
parent 44bf70fba26146d7e788ec051ee4ab45336de2fa

Merge "Set the reason for screen-off before usage."

services/java/com/android/server/PowerManagerService.java

diff --git a/services/java/com/android/server/PowerManagerService.java b/services/java/com/android/server/PowerManagerService.java
index 63418db..52a4110 100644
--- a/services/java/com/android/server/PowerManagerService.java
+++ b/services/java/com/android/server/PowerManagerService.java
@@ -1858,6 +1858,7 @@
                 } else {
                     // Update the lights *before* taking care of turning the
                     // screen off, so we can initiate any animations that are desired.
+                    mScreenOffReason = reason;
                     if (stateChanged) {
                         updateLightsLocked(newState, 0);
                     }
@@ -1876,7 +1877,6 @@
                         Binder.restoreCallingIdentity(identity);
                     }
                     mPowerState &= ~SCREEN_ON_BIT;
-                    mScreenOffReason = reason;
                     if (!mScreenBrightnessAnimator.isAnimating()) {
                         err = screenOffFinishedAnimatingLocked(reason);
                     } else {