Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev

Browse Source
This commit is contained in:
Nick Armstrong-Crews
2015-10-05 18:23:12 +00:00
committed by Android (Google) Code Review
parent 3daab8e7a7 024872ea70
commit 13a71fbcf0
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
services/core/java/com/android/server/power/PowerManagerService.java
View File

@@ -397,6 +397,10 @@ public final class PowerManagerService extends SystemService
// Set this to false to disable. // Set this to false to disable.
private boolean mUserInactiveOverrideFromWindowManager; 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 // The user activity timeout override from the window manager
// to allow the current foreground activity to override the user activity timeout. // to allow the current foreground activity to override the user activity timeout.
// Use -1 to disable. // Use -1 to disable.
@@ -1034,6 +1038,7 @@ public final class PowerManagerService extends SystemService
if (mUserInactiveOverrideFromWindowManager) { if (mUserInactiveOverrideFromWindowManager) {
mUserInactiveOverrideFromWindowManager = false; mUserInactiveOverrideFromWindowManager = false;
mOverriddenTimeout = -1;
} }
if (mWakefulness == WAKEFULNESS_ASLEEP 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() { private void finishWakefulnessChangeIfNeededLocked() {
if (mWakefulnessChanging && mDisplayReady) { if (mWakefulnessChanging && mDisplayReady) {
if (mWakefulness == WAKEFULNESS_DOZING if (mWakefulness == WAKEFULNESS_DOZING
&& (mWakeLockSummary & WAKE_LOCK_DOZE) == 0) { && (mWakeLockSummary & WAKE_LOCK_DOZE) == 0) {
return; // wait until dream has enabled dozing return; // wait until dream has enabled dozing
} }
if (mWakefulness == WAKEFULNESS_DOZING || mWakefulness == WAKEFULNESS_ASLEEP) {
logSleepTimeoutRecapturedLocked();
}
mWakefulnessChanging = false; mWakefulnessChanging = false;
mNotifier.onWakefulnessChangeFinished(); mNotifier.onWakefulnessChangeFinished();
} }
@@ -1579,10 +1600,11 @@ public final class PowerManagerService extends SystemService
if (mUserActivitySummary != USER_ACTIVITY_SCREEN_DREAM && userInactiveOverride) { if (mUserActivitySummary != USER_ACTIVITY_SCREEN_DREAM && userInactiveOverride) {
if ((mUserActivitySummary & if ((mUserActivitySummary &
(USER_ACTIVITY_SCREEN_BRIGHT | USER_ACTIVITY_SCREEN_DIM)) != 0) { (USER_ACTIVITY_SCREEN_BRIGHT | USER_ACTIVITY_SCREEN_DIM)) != 0) {
// Device is being kept awake by recent user activity // Device is being kept awake by recent user activity
long savedWakeTimeMs = now - nextTimeout; if (nextTimeout >= now && mOverriddenTimeout == -1) {
EventLog.writeEvent( // Save when the next timeout would have occurred
EventLogTags.POWER_SOFT_SLEEP_REQUESTED, savedWakeTimeMs); mOverriddenTimeout = nextTimeout;
}
} }
mUserActivitySummary = USER_ACTIVITY_SCREEN_DREAM; mUserActivitySummary = USER_ACTIVITY_SCREEN_DREAM;
nextTimeout = -1; nextTimeout = -1;