Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5454bac3 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

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

am: 83876c73

Change-Id: I843e2469694c31ee23148ae09cb7b9c5d7506bfc
parents e6c56b7d 83876c73

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

+2 −1
Original line number Diff line number Diff line
@@ -1943,7 +1943,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;