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

Merge "Try to always print time stamp in battery history."

Browse Source
This commit is contained in:
Dianne Hackborn
2014-04-21 20:52:48 +00:00
committed by Android (Google) Code Review
parent 49d8fa4739 99009ea7dc
commit ec687133e0
2 changed files with 62 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
core/java/android/os/BatteryStats.java
View File

@@ -2861,29 +2861,21 @@ public abstract class BatteryStats implements Parcelable {
int oldTemp = -1; int oldTemp = -1;
int oldVolt = -1; int oldVolt = -1;
long lastTime = -1; long lastTime = -1;
long firstTime = -1;
public void printNextItem(PrintWriter pw, HistoryItem rec, long now, boolean checkin, public void printNextItem(PrintWriter pw, HistoryItem rec, long baseTime, boolean checkin,
boolean verbose) { boolean verbose) {
if (!checkin) { if (!checkin) {
pw.print(" "); pw.print(" ");
if (now >= 0) { TimeUtils.formatDuration(rec.time - baseTime, pw, TimeUtils.HUNDRED_DAY_FIELD_LEN);
TimeUtils.formatDuration(rec.time-now, pw, TimeUtils.HUNDRED_DAY_FIELD_LEN);
} else {
TimeUtils.formatDuration(rec.time, pw, TimeUtils.HUNDRED_DAY_FIELD_LEN);
}
pw.print(" ("); pw.print(" (");
pw.print(rec.numReadInts); pw.print(rec.numReadInts);
pw.print(") "); pw.print(") ");
} else { } else {
if (lastTime < 0) { if (lastTime < 0) {
if (now >= 0) { pw.print(rec.time - baseTime);
pw.print("@");
pw.print(rec.time-now);
} else {
pw.print(rec.time);
}
} else { } else {
pw.print(rec.time-lastTime); pw.print(rec.time - lastTime);
} }
lastTime = rec.time; lastTime = rec.time;
} }
@@ -3132,10 +3124,27 @@ public abstract class BatteryStats implements Parcelable {
pw.println("):"); pw.println("):");
HistoryPrinter hprinter = new HistoryPrinter(); HistoryPrinter hprinter = new HistoryPrinter();
long lastTime = -1; long lastTime = -1;
long baseTime = -1;
boolean printed = false;
while (getNextHistoryLocked(rec)) { while (getNextHistoryLocked(rec)) {
lastTime = rec.time; lastTime = rec.time;
if (baseTime < 0) {
baseTime = lastTime;
}
if (rec.time >= histStart) { if (rec.time >= histStart) {
hprinter.printNextItem(pw, rec, histStart >= 0 ? -1 : now, false, if (histStart >= 0 && !printed) {
if (rec.cmd == HistoryItem.CMD_CURRENT_TIME) {
printed = true;
} else if (rec.currentTime != 0) {
printed = true;
byte cmd = rec.cmd;
rec.cmd = HistoryItem.CMD_CURRENT_TIME;
hprinter.printNextItem(pw, rec, baseTime, false,
(flags&DUMP_VERBOSE) != 0);
rec.cmd = cmd;
}
}
hprinter.printNextItem(pw, rec, baseTime, false,
(flags&DUMP_VERBOSE) != 0); (flags&DUMP_VERBOSE) != 0);
} }
} }
@@ -3152,8 +3161,12 @@ public abstract class BatteryStats implements Parcelable {
try { try {
pw.println("Old battery History:"); pw.println("Old battery History:");
HistoryPrinter hprinter = new HistoryPrinter(); HistoryPrinter hprinter = new HistoryPrinter();
long baseTime = -1;
while (getNextOldHistoryLocked(rec)) { while (getNextOldHistoryLocked(rec)) {
hprinter.printNextItem(pw, rec, now, false, (flags&DUMP_VERBOSE) != 0); if (baseTime < 0) {
baseTime = rec.time;
}
hprinter.printNextItem(pw, rec, baseTime, false, (flags&DUMP_VERBOSE) != 0);
} }
pw.println(); pw.println();
} finally { } finally {
@@ -3226,20 +3239,42 @@ public abstract class BatteryStats implements Parcelable {
pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(',');
pw.print(HISTORY_STRING_POOL); pw.print(','); pw.print(HISTORY_STRING_POOL); pw.print(',');
pw.print(i); pw.print(i);
pw.print(','); pw.print(",");
pw.print(getHistoryTagPoolString(i));
pw.print(',');
pw.print(getHistoryTagPoolUid(i)); pw.print(getHistoryTagPoolUid(i));
pw.print(",\"");
String str = getHistoryTagPoolString(i);
str = str.replace("\\", "\\\\");
str = str.replace("\"", "\\\"");
pw.print(str);
pw.print("\"");
pw.println(); pw.println();
} }
HistoryPrinter hprinter = new HistoryPrinter(); HistoryPrinter hprinter = new HistoryPrinter();
long lastTime = -1; long lastTime = -1;
long baseTime = -1;
boolean printed = false;
while (getNextHistoryLocked(rec)) { while (getNextHistoryLocked(rec)) {
lastTime = rec.time; lastTime = rec.time;
if (baseTime < 0) {
baseTime = lastTime;
}
if (rec.time >= histStart) { if (rec.time >= histStart) {
if (histStart >= 0 && !printed) {
if (rec.cmd == HistoryItem.CMD_CURRENT_TIME) {
printed = true;
} else if (rec.currentTime != 0) {
printed = true;
byte cmd = rec.cmd;
rec.cmd = HistoryItem.CMD_CURRENT_TIME;
pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(',');
pw.print(HISTORY_DATA); pw.print(',');
hprinter.printNextItem(pw, rec, baseTime, true, false);
rec.cmd = cmd;
}
}
pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(',');
pw.print(HISTORY_DATA); pw.print(','); pw.print(HISTORY_DATA); pw.print(',');
hprinter.printNextItem(pw, rec, histStart >= 0 ? -1 : now, true, false); hprinter.printNextItem(pw, rec, baseTime, true, false);
} }
} }
if (histStart >= 0) { if (histStart >= 0) {

11
core/java/com/android/internal/os/BatteryStatsImpl.java
View File

@@ -5580,13 +5580,13 @@ public final class BatteryStatsImpl extends BatteryStats {
if (end) { if (end) {
Slog.w(TAG, "New history ends before old history!"); Slog.w(TAG, "New history ends before old history!");
} else if (!out.same(mHistoryReadTmp)) { } else if (!out.same(mHistoryReadTmp)) {
long now = getHistoryBaseTime() + SystemClock.elapsedRealtime();
PrintWriter pw = new FastPrintWriter(new LogWriter(android.util.Log.WARN, TAG)); PrintWriter pw = new FastPrintWriter(new LogWriter(android.util.Log.WARN, TAG));
pw.println("Histories differ!"); pw.println("Histories differ!");
pw.println("Old history:"); pw.println("Old history:");
(new HistoryPrinter()).printNextItem(pw, out, now, false, true); (new HistoryPrinter()).printNextItem(pw, out, 0, false, true);
pw.println("New history:"); pw.println("New history:");
(new HistoryPrinter()).printNextItem(pw, mHistoryReadTmp, now, false, true); (new HistoryPrinter()).printNextItem(pw, mHistoryReadTmp, 0, false,
true);
pw.flush(); pw.flush();
} }
} }
@@ -5664,7 +5664,12 @@ public final class BatteryStatsImpl extends BatteryStats {
return false; return false;
} }
final long lastRealtime = out.time;
final long lastWalltime = out.currentTime;
readHistoryDelta(mHistoryBuffer, out); readHistoryDelta(mHistoryBuffer, out);
if (out.cmd != HistoryItem.CMD_CURRENT_TIME && lastWalltime != 0) {
out.currentTime = lastWalltime + (out.time - lastRealtime);
}
return true; return true;
} }