From b55e3a126ef5a33e23176b1ac2fbe74f590cbcaa Mon Sep 17 00:00:00 2001 From: Michael Wright Date: Tue, 6 Mar 2018 15:14:06 +0000 Subject: [PATCH] Add logging for screen timeout override. Bug: 72312560 Test: flash, see log Change-Id: I85662b567059d3c9bc2777670cef9a8f47af7465 --- services/core/java/com/android/server/EventLogTags.logtags | 2 ++ .../java/com/android/server/power/PowerManagerService.java | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/EventLogTags.logtags b/services/core/java/com/android/server/EventLogTags.logtags index 0502117cd73a3..45c9a711e8c54 100644 --- a/services/core/java/com/android/server/EventLogTags.logtags +++ b/services/core/java/com/android/server/EventLogTags.logtags @@ -35,6 +35,8 @@ option java_package com.android.server # Power save state has changed. See BatterySaverController.java for the details. 2739 battery_saver_mode (prevOffOrOn|1|5),(nowOffOrOn|1|5),(interactive|1|5),(features|3|5) 27390 battery_saving_stats (batterySaver|1|5),(interactive|1|5),(doze|1|5),(delta_duration|2|3),(delta_battery_drain|1|1),(delta_battery_drain_percent|1|6),(total_duration|2|3),(total_battery_drain|1|1),(total_battery_drain_percent|1|6) +# Note when the user activity timeout has been overriden by ActivityManagerService +27391 user_activity_timeout_override (override|2|3) # # Leave IDs through 2740 for more power logs (2730 used by battery_discharge above) diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index f77b0ee592497..d7d39226722cd 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -68,7 +68,6 @@ import android.provider.Settings.SettingNotFoundException; import android.service.dreams.DreamManagerInternal; import android.service.vr.IVrManager; import android.service.vr.IVrStateCallbacks; -import android.util.EventLog; import android.util.KeyValueListParser; import android.util.MathUtils; import android.util.PrintWriterPrinter; @@ -1487,7 +1486,7 @@ public final class PowerManagerService extends SystemService break; } } - EventLog.writeEvent(EventLogTags.POWER_SLEEP_REQUESTED, numWakeLocksCleared); + EventLogTags.writePowerSleepRequested(numWakeLocksCleared); // Skip dozing if requested. if ((flags & PowerManager.GO_TO_SLEEP_FLAG_NO_DOZE) != 0) { @@ -1572,7 +1571,7 @@ public final class PowerManagerService extends SystemService final long now = SystemClock.uptimeMillis(); final long savedWakeTimeMs = mOverriddenTimeout - now; if (savedWakeTimeMs >= 0) { - EventLog.writeEvent(EventLogTags.POWER_SOFT_SLEEP_REQUESTED, savedWakeTimeMs); + EventLogTags.writePowerSoftSleepRequested(savedWakeTimeMs); mOverriddenTimeout = -1; } } @@ -3157,6 +3156,7 @@ public final class PowerManagerService extends SystemService synchronized (mLock) { if (mUserActivityTimeoutOverrideFromWindowManager != timeoutMillis) { mUserActivityTimeoutOverrideFromWindowManager = timeoutMillis; + EventLogTags.writeUserActivityTimeoutOverride(timeoutMillis); mDirty |= DIRTY_SETTINGS; updatePowerStateLocked(); }