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

Commit 024872ea authored by Nick Armstrong-Crews's avatar Nick Armstrong-Crews
Browse files

Fix the logging of wake time saved by Ungaze. 

The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.

Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
parent 8197e2de

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

+26 −4
Original line number Diff line number Diff line
@@ -397,6 +397,10 @@ public final class PowerManagerService extends SystemService 
    // Set this to false to disable.

    private boolean mUserInactiveOverrideFromWindowManager;



    // The next possible user activity timeout after being explicitly told the user is inactive.

    // Set to -1 when not told the user is inactive since the last period spent dozing or asleep.

    private long mOverriddenTimeout = -1;



    // The user activity timeout override from the window manager

    // to allow the current foreground activity to override the user activity timeout.

    // Use -1 to disable.
@@ -1034,6 +1038,7 @@ public final class PowerManagerService extends SystemService 


            if (mUserInactiveOverrideFromWindowManager) {

                mUserInactiveOverrideFromWindowManager = false;

                mOverriddenTimeout = -1;

            }



            if (mWakefulness == WAKEFULNESS_ASLEEP
@@ -1251,12 +1256,28 @@ public final class PowerManagerService extends SystemService 
        }

    }



    /**

     * Logs the time the device would have spent awake before user activity timeout,

     * had the system not been told the user was inactive.

     */

    private void logSleepTimeoutRecapturedLocked() {

        final long now = SystemClock.uptimeMillis();

        final long savedWakeTimeMs = mOverriddenTimeout - now;

        if (savedWakeTimeMs >= 0) {

            EventLog.writeEvent(EventLogTags.POWER_SOFT_SLEEP_REQUESTED, savedWakeTimeMs);

            mOverriddenTimeout = -1;

        }

    }



    private void finishWakefulnessChangeIfNeededLocked() {

        if (mWakefulnessChanging && mDisplayReady) {

            if (mWakefulness == WAKEFULNESS_DOZING

                    && (mWakeLockSummary & WAKE_LOCK_DOZE) == 0) {

                return; // wait until dream has enabled dozing

            }

            if (mWakefulness == WAKEFULNESS_DOZING || mWakefulness == WAKEFULNESS_ASLEEP) {

                logSleepTimeoutRecapturedLocked();

            }

            mWakefulnessChanging = false;

            mNotifier.onWakefulnessChangeFinished();

        }
@@ -1580,9 +1601,10 @@ public final class PowerManagerService extends SystemService 
                    if ((mUserActivitySummary &

                            (USER_ACTIVITY_SCREEN_BRIGHT | USER_ACTIVITY_SCREEN_DIM)) != 0) {

                        // Device is being kept awake by recent user activity

                      long savedWakeTimeMs = now - nextTimeout;

                      EventLog.writeEvent(

                              EventLogTags.POWER_SOFT_SLEEP_REQUESTED, savedWakeTimeMs);

                        if (nextTimeout >= now && mOverriddenTimeout == -1) {

                            // Save when the next timeout would have occurred

                            mOverriddenTimeout = nextTimeout;

                        }

                    }

                    mUserActivitySummary = USER_ACTIVITY_SCREEN_DREAM;

                    nextTimeout = -1;