Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev

diff --combined services/core/java/com/android/server/power/PowerManagerService.java
index c8ade2d,1648e81..ed98d1c
--- 1/services/core/java/com/android/server/power/PowerManagerService.java
--- 2/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@@ -1940,7 -1940,8 +1940,8 @@@ public final class PowerManagerService 
                          && mLastUserActivityTimeNoChangeLights >= mLastWakeTime) {
                      nextTimeout = mLastUserActivityTimeNoChangeLights + screenOffTimeout;
                      if (now < nextTimeout) {
-                         if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_BRIGHT) {
+                         if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_BRIGHT
+                                 || mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_VR) {
                              mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;
                          } else if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DIM) {
                              mUserActivitySummary = USER_ACTIVITY_SCREEN_DIM;
@@@ -3122,6 -3123,10 +3123,6 @@@
          if (reason == null) {
              reason = "";
          }
 -        if (reason.equals(PowerManager.REBOOT_RECOVERY)
 -                || reason.equals(PowerManager.REBOOT_RECOVERY_UPDATE)) {
 -            reason = "recovery";
 -        }
  
          // If the reason is "quiescent", it means that the boot process should proceed
          // without turning on the screen/lights.
@@@ -3130,15 -3135,6 +3131,15 @@@
          if (reason.equals(PowerManager.REBOOT_QUIESCENT)) {
              sQuiescent = true;
              reason = "";
 +        } else if (reason.endsWith("," + PowerManager.REBOOT_QUIESCENT)) {
 +            sQuiescent = true;
 +            reason = reason.substring(0,
 +                    reason.length() - PowerManager.REBOOT_QUIESCENT.length() - 1);
 +        }
 +
 +        if (reason.equals(PowerManager.REBOOT_RECOVERY)
 +                || reason.equals(PowerManager.REBOOT_RECOVERY_UPDATE)) {
 +            reason = "recovery";
          }
  
          if (sQuiescent) {