From 9407a6b52cd9b98e714ceb7b699e5c453a252386 Mon Sep 17 00:00:00 2001 From: Andrii Kulian Date: Wed, 24 May 2017 12:24:09 -0700 Subject: [PATCH] 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index a8d19e94dea5..1648e8106cd7 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 @@ public final class PowerManagerService extends SystemService && 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; -- 2.11.0