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

Commit 23681cb2 authored by nadlabak's avatar nadlabak Committed by Steve Kondik
Browse files

PowerManagerService: Fix updating of mUserActivitySummary 

I7f1fc35a1573717d1ea101a07c4171d6f66d1553 missed the fact that the primary
purpose of the affected condition block was to update mUserActivitySummary
and the button/keyboard light handling was just appended to it later.

This fixes the waking from dream/screensaver by user activity.

I30c5c8c9c09e3d57ace18cac72b783510b9b3bf3 is removed here as well as it was
just a band aid.

jira: NIGHTLIES-1285

Change-Id: I6b2f6c58e73110787d62e86d4d2ef538638cf491
parent 2103fec4

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

+25 −19
Original line number Diff line number Diff line
@@ -1679,10 +1679,12 @@ public final class PowerManagerService extends SystemService 
                final boolean userInactiveOverride = mUserInactiveOverrideFromWindowManager;



                mUserActivitySummary = 0;

                if (mWakefulness == WAKEFULNESS_AWAKE && mLastUserActivityTime >= mLastWakeTime) {

                if (mLastUserActivityTime >= mLastWakeTime) {

                    nextTimeout = mLastUserActivityTime

                            + screenOffTimeout - screenDimDuration;

                    if (now < nextTimeout) {

                        mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;

                        if (mWakefulness == WAKEFULNESS_AWAKE) {

                            int buttonBrightness, keyboardBrightness;

                            if (mButtonBrightnessOverrideFromWindowManager >= 0) {

                                buttonBrightness = mButtonBrightnessOverrideFromWindowManager;
@@ -1692,8 +1694,10 @@ public final class PowerManagerService extends SystemService 
                                keyboardBrightness = mKeyboardBrightness;

                            }



                        mKeyboardLight.setBrightness(mKeyboardVisible ? keyboardBrightness : 0);

                        if (mButtonTimeout != 0 && now > mLastUserActivityTime + mButtonTimeout) {

                            mKeyboardLight.setBrightness(mKeyboardVisible ?

                                    keyboardBrightness : 0);

                            if (mButtonTimeout != 0

                                    && now > mLastUserActivityTime + mButtonTimeout) {

                                mButtonsLight.setBrightness(0);

                            } else {

                                mButtonsLight.setBrightness(buttonBrightness);
@@ -1701,13 +1705,15 @@ public final class PowerManagerService extends SystemService 
                                    nextTimeout = now + mButtonTimeout;

                                }

                            }

                        mUserActivitySummary = USER_ACTIVITY_SCREEN_BRIGHT;

                        }

                    } else {

                        nextTimeout = mLastUserActivityTime + screenOffTimeout;

                        if (now < nextTimeout) {

                            mUserActivitySummary = USER_ACTIVITY_SCREEN_DIM;

                            if (mWakefulness == WAKEFULNESS_AWAKE) {

                                mButtonsLight.setBrightness(0);

                                mKeyboardLight.setBrightness(0);

                            mUserActivitySummary = USER_ACTIVITY_SCREEN_DIM;

                            }

                        }

                    }

                }