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

Commit e63965ce authored by Andrii Kulian's avatar Andrii Kulian Committed by Android (Google) Code Review
Browse files

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

parents a7914f24 9407a6b5

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -1940,7 +1940,8 @@ public final class PowerManagerService extends SystemService 
                        && mLastUserActivityTimeNoChangeLights >= mLastWakeTime) {

                        && mLastUserActivityTimeNoChangeLights >= mLastWakeTime) {

                    nextTimeout = mLastUserActivityTimeNoChangeLights + screenOffTimeout;

                    nextTimeout = mLastUserActivityTimeNoChangeLights + screenOffTimeout;

                    if (now < nextTimeout) {

                    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;

                            mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;

                        } else if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DIM) {

                        } else if (mDisplayPowerRequest.policy == DisplayPowerRequest.POLICY_DIM) {

                            mUserActivitySummary = USER_ACTIVITY_SCREEN_DIM;

                            mUserActivitySummary = USER_ACTIVITY_SCREEN_DIM;