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

Merge "Also show "last BS off time" in dumpsys power" into pi-dev

Browse Source
This commit is contained in:
Makoto Onuki
2018-03-16 21:48:20 +00:00
committed by Android (Google) Code Review
parent b998c8eee2 7025c3c391
commit 6344ffd4c9
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java
View File

@@ -162,9 +162,15 @@ public class BatterySavingStats {
@GuardedBy("mLock")
private int mBatterySaverEnabledCount = 0;
@GuardedBy("mLock")
private boolean mIsBatterySaverEnabled;
@GuardedBy("mLock")
private long mLastBatterySaverEnabledTime = 0;
@GuardedBy("mLock")
private long mLastBatterySaverDisabledTime = 0;
private final MetricsLoggerHelper mMetricsLoggerHelper = new MetricsLoggerHelper();
@VisibleForTesting
@@ -312,11 +318,12 @@ public class BatterySavingStats {
final boolean newBatterySaverEnabled =
BatterySaverState.fromIndex(newState) != BatterySaverState.OFF;
if (oldBatterySaverEnabled != newBatterySaverEnabled) {
mIsBatterySaverEnabled = newBatterySaverEnabled;
if (newBatterySaverEnabled) {
mBatterySaverEnabledCount++;
mLastBatterySaverEnabledTime = injectCurrentTime();
} else {
mLastBatterySaverEnabledTime = 0;
mLastBatterySaverDisabledTime = injectCurrentTime();
}
}
@@ -391,25 +398,35 @@ public class BatterySavingStats {
indent = indent + " ";
final long now = System.currentTimeMillis();
final long nowElapsed = injectCurrentTime();
final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
pw.print(indent);
pw.print("Battery Saver state: ");
if (mLastBatterySaverEnabledTime == 0) {
pw.print("OFF");
} else {
pw.print("ON since ");
final long now = System.currentTimeMillis();
final long nowElapsed = injectCurrentTime();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
pw.print("Battery Saver is currently: ");
pw.println(mIsBatterySaverEnabled ? "ON" : "OFF");
if (mLastBatterySaverEnabledTime > 0) {
pw.print(indent);
pw.print(" ");
pw.print("Last ON time: ");
pw.print(sdf.format(new Date(now - nowElapsed + mLastBatterySaverEnabledTime)));
pw.print(" ");
TimeUtils.formatDuration(mLastBatterySaverEnabledTime, nowElapsed, pw);
pw.println();
}
if (mLastBatterySaverDisabledTime > 0) {
pw.print(indent);
pw.print(" ");
pw.print("Last OFF time: ");
pw.print(sdf.format(new Date(now - nowElapsed + mLastBatterySaverDisabledTime)));
pw.print(" ");
TimeUtils.formatDuration(mLastBatterySaverDisabledTime, nowElapsed, pw);
pw.println();
}
pw.println();
pw.print(indent);
pw.print(" ");
pw.print("Times enabled: ");
pw.println(mBatterySaverEnabledCount);