commit 9407a6b52cd9b98e714ceb7b699e5c453a252386
author Andrii Kulian <akulian@google.com> Wed May 24 12:24:09 2017 -0700
committer Andrii Kulian <akulian@google.com> Thu May 25 23:35:26 2017 +0000
tree 397113547ecd69c3ba02180ed09b6d6a597ca5da
parent ad6dde65ff767b25a0c7795def86235518853dd2

Refresh screen off timeout when screen lock is released in VR

When evaluating conditions for user activity with no lights change,
treat POLICY_VR the same way as for POLICY_BRIGHT, so new activity
timeout will be set.

Bug: 37968591
Test: Set screen timeout to 15s, launch Daydream, wait, launch Welcome flow.
Change-Id: I3185cc97364ae5631ef53906958b16d41f326c3b

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

diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index a8d19e9..1648e81 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -1940,7 +1940,8 @@
                         && 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;