diff options
| author | 2017-05-26 23:25:23 +0000 | |
|---|---|---|
| committer | 2017-05-26 23:25:23 +0000 | |
| commit | 83876c735ef8c6bb205cac27a8ce74e2c957f2bf (patch) | |
| tree | 94f899130123029c0ea57b89f500bcec08f7a0c1 | |
| parent | 8546ca67da9dd59c93aae8baad61dec4de0e1a45 (diff) | |
| parent | e63965cef516777dae682103e0813b7f024dab62 (diff) | |
Merge "Refresh screen off timeout when screen lock is released in VR" into oc-dev
am: e63965cef5
Change-Id: If1e6876fa6466fa047213f6f1ebbb42d004486f0
| -rw-r--r-- | services/core/java/com/android/server/power/PowerManagerService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index c8ade2d2d395..ed98d1cbc5b2 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; |