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

Merge "Adding batterystats history to proto dump." into pi-dev

Browse Source 
am: 291b944d89

Change-Id: Ie1766ac31bc048eeba13d540c446372ef56c2da6
This commit is contained in:
android-build-team Robot
2018-05-08 08:11:22 -07:00
committed by android-build-merger
parent 769039598b 291b944d89
commit ccb89f9263
10 changed files with 401 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmds/incidentd/src/Reporter.cpp
View File

@@ -22,6 +22,7 @@
#include "report_directory.h" #include "report_directory.h"
#include "section_list.h" #include "section_list.h"
#include <android-base/properties.h>
#include <android/os/DropBoxManager.h> #include <android/os/DropBoxManager.h>
#include <private/android_filesystem_config.h> #include <private/android_filesystem_config.h>
#include <utils/SystemClock.h> #include <utils/SystemClock.h>
@@ -31,6 +32,7 @@
#include <fcntl.h> #include <fcntl.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <string>
/** /**
* The directory where the incident reports are stored. * The directory where the incident reports are stored.
@@ -129,6 +131,8 @@ Reporter::run_report_status_t Reporter::runReport(size_t* reportByteSize) {
int mainDest = -1; int mainDest = -1;
HeaderSection headers; HeaderSection headers;
MetadataSection metadataSection; MetadataSection metadataSection;
std::string buildType = android::base::GetProperty("ro.build.type", "");
const bool isUserdebugOrEng = buildType == "userdebug" || buildType == "eng";
// See if we need the main file // See if we need the main file
for (ReportRequestSet::iterator it = batch.begin(); it != batch.end(); it++) { for (ReportRequestSet::iterator it = batch.begin(); it != batch.end(); it++) {
@@ -175,6 +179,11 @@ Reporter::run_report_status_t Reporter::runReport(size_t* reportByteSize) {
// and report to those that care that we're doing it. // and report to those that care that we're doing it.
for (const Section** section = SECTION_LIST; *section; section++) { for (const Section** section = SECTION_LIST; *section; section++) {
const int id = (*section)->id; const int id = (*section)->id;
if ((*section)->userdebugAndEngOnly && !isUserdebugOrEng) {
ALOGD("Skipping incident report section %d '%s' because it's limited to userdebug/eng",
id, (*section)->name.string());
continue;
}
if (this->batch.containsSection(id)) { if (this->batch.containsSection(id)) {
ALOGD("Taking incident report section %d '%s'", id, (*section)->name.string()); ALOGD("Taking incident report section %d '%s'", id, (*section)->name.string());
for (ReportRequestSet::iterator it = batch.begin(); it != batch.end(); it++) { for (ReportRequestSet::iterator it = batch.begin(); it != batch.end(); it++) {

17
cmds/incidentd/src/Section.cpp
View File

@@ -151,8 +151,11 @@ DONE:
} }
// ================================================================================ // ================================================================================
Section::Section(int i, int64_t timeoutMs, bool deviceSpecific) Section::Section(int i, int64_t timeoutMs, bool userdebugAndEngOnly, bool deviceSpecific)
: id(i), timeoutMs(timeoutMs), deviceSpecific(deviceSpecific) {} : id(i),
timeoutMs(timeoutMs),
userdebugAndEngOnly(userdebugAndEngOnly),
deviceSpecific(deviceSpecific) {}
Section::~Section() {} Section::~Section() {}
@@ -239,7 +242,7 @@ static inline bool isSysfs(const char* filename) { return strncmp(filename, "/sy
FileSection::FileSection(int id, const char* filename, const bool deviceSpecific, FileSection::FileSection(int id, const char* filename, const bool deviceSpecific,
const int64_t timeoutMs) const int64_t timeoutMs)
: Section(id, timeoutMs, deviceSpecific), mFilename(filename) { : Section(id, timeoutMs, false, deviceSpecific), mFilename(filename) {
name = filename; name = filename;
mIsSysfs = isSysfs(filename); mIsSysfs = isSysfs(filename);
} }
@@ -417,8 +420,8 @@ WorkerThreadData::WorkerThreadData(const WorkerThreadSection* sec)
WorkerThreadData::~WorkerThreadData() {} WorkerThreadData::~WorkerThreadData() {}
// ================================================================================ // ================================================================================
WorkerThreadSection::WorkerThreadSection(int id, const int64_t timeoutMs) WorkerThreadSection::WorkerThreadSection(int id, const int64_t timeoutMs, bool userdebugAndEngOnly)
: Section(id, timeoutMs) {} : Section(id, timeoutMs, userdebugAndEngOnly) {}
WorkerThreadSection::~WorkerThreadSection() {} WorkerThreadSection::~WorkerThreadSection() {}
@@ -615,8 +618,8 @@ status_t CommandSection::Execute(ReportRequestSet* requests) const {
} }
// ================================================================================ // ================================================================================
DumpsysSection::DumpsysSection(int id, const char* service, ...) DumpsysSection::DumpsysSection(int id, bool userdebugAndEngOnly, const char* service, ...)
: WorkerThreadSection(id), mService(service) { : WorkerThreadSection(id, REMOTE_CALL_TIMEOUT_MS, userdebugAndEngOnly), mService(service) {
name = "dumpsys "; name = "dumpsys ";
name += service; name += service;

9
cmds/incidentd/src/Section.h
View File

@@ -40,10 +40,12 @@ class Section {
public: public:
const int id; const int id;
const int64_t timeoutMs; // each section must have a timeout const int64_t timeoutMs; // each section must have a timeout
const bool userdebugAndEngOnly;
const bool deviceSpecific; const bool deviceSpecific;
String8 name; String8 name;
Section(int id, int64_t timeoutMs = REMOTE_CALL_TIMEOUT_MS, bool deviceSpecific = false); Section(int id, int64_t timeoutMs = REMOTE_CALL_TIMEOUT_MS, bool userdebugAndEngOnly = false,
bool deviceSpecific = false);
virtual ~Section(); virtual ~Section();
virtual status_t Execute(ReportRequestSet* requests) const = 0; virtual status_t Execute(ReportRequestSet* requests) const = 0;
@@ -107,7 +109,8 @@ private:
*/ */
class WorkerThreadSection : public Section { class WorkerThreadSection : public Section {
public: public:
WorkerThreadSection(int id, int64_t timeoutMs = REMOTE_CALL_TIMEOUT_MS); WorkerThreadSection(int id, int64_t timeoutMs = REMOTE_CALL_TIMEOUT_MS,
bool userdebugAndEngOnly = false);
virtual ~WorkerThreadSection(); virtual ~WorkerThreadSection();
virtual status_t Execute(ReportRequestSet* requests) const; virtual status_t Execute(ReportRequestSet* requests) const;
@@ -137,7 +140,7 @@ private:
*/ */
class DumpsysSection : public WorkerThreadSection { class DumpsysSection : public WorkerThreadSection {
public: public:
DumpsysSection(int id, const char* service, ...); DumpsysSection(int id, bool userdebugAndEngOnly, const char* service, ...);
virtual ~DumpsysSection(); virtual ~DumpsysSection();
virtual status_t BlockingCall(int pipeWriteFd) const; virtual status_t BlockingCall(int pipeWriteFd) const;

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

@@ -21,6 +21,7 @@ import android.app.job.JobParameters;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.server.ServerProtoEnums; import android.server.ServerProtoEnums;
import android.service.batterystats.BatteryStatsServiceDumpHistoryProto;
import android.service.batterystats.BatteryStatsServiceDumpProto; import android.service.batterystats.BatteryStatsServiceDumpProto;
import android.telephony.SignalStrength; import android.telephony.SignalStrength;
import android.telephony.TelephonyManager; import android.telephony.TelephonyManager;
@@ -6030,51 +6031,51 @@ public abstract class BatteryStats implements Parcelable {
} }
} }
static void printBitDescriptions(PrintWriter pw, int oldval, int newval, HistoryTag wakelockTag, static void printBitDescriptions(StringBuilder sb, int oldval, int newval,
BitDescription[] descriptions, boolean longNames) { HistoryTag wakelockTag, BitDescription[] descriptions, boolean longNames) {
int diff = oldval ^ newval; int diff = oldval ^ newval;
if (diff == 0) return; if (diff == 0) return;
boolean didWake = false; boolean didWake = false;
for (int i=0; i<descriptions.length; i++) { for (int i=0; i<descriptions.length; i++) {
BitDescription bd = descriptions[i]; BitDescription bd = descriptions[i];
if ((diff&bd.mask) != 0) { if ((diff&bd.mask) != 0) {
pw.print(longNames ? " " : ","); sb.append(longNames ? " " : ",");
if (bd.shift < 0) { if (bd.shift < 0) {
pw.print((newval&bd.mask) != 0 ? "+" : "-"); sb.append((newval & bd.mask) != 0 ? "+" : "-");
pw.print(longNames ? bd.name : bd.shortName); sb.append(longNames ? bd.name : bd.shortName);
if (bd.mask == HistoryItem.STATE_WAKE_LOCK_FLAG && wakelockTag != null) { if (bd.mask == HistoryItem.STATE_WAKE_LOCK_FLAG && wakelockTag != null) {
didWake = true; didWake = true;
pw.print("="); sb.append("=");
if (longNames) { if (longNames) {
UserHandle.formatUid(pw, wakelockTag.uid); UserHandle.formatUid(sb, wakelockTag.uid);
pw.print(":\""); sb.append(":\"");
pw.print(wakelockTag.string); sb.append(wakelockTag.string);
pw.print("\""); sb.append("\"");
} else { } else {
pw.print(wakelockTag.poolIdx); sb.append(wakelockTag.poolIdx);
} }
} }
} else { } else {
pw.print(longNames ? bd.name : bd.shortName); sb.append(longNames ? bd.name : bd.shortName);
pw.print("="); sb.append("=");
int val = (newval&bd.mask)>>bd.shift; int val = (newval&bd.mask)>>bd.shift;
if (bd.values != null && val >= 0 && val < bd.values.length) { if (bd.values != null && val >= 0 && val < bd.values.length) {
pw.print(longNames? bd.values[val] : bd.shortValues[val]); sb.append(longNames ? bd.values[val] : bd.shortValues[val]);
} else { } else {
pw.print(val); sb.append(val);
} }
} }
} }
} }
if (!didWake && wakelockTag != null) { if (!didWake && wakelockTag != null) {
pw.print(longNames ? " wake_lock=" : ",w="); sb.append(longNames ? " wake_lock=" : ",w=");
if (longNames) { if (longNames) {
UserHandle.formatUid(pw, wakelockTag.uid); UserHandle.formatUid(sb, wakelockTag.uid);
pw.print(":\""); sb.append(":\"");
pw.print(wakelockTag.string); sb.append(wakelockTag.string);
pw.print("\""); sb.append("\"");
} else { } else {
pw.print(wakelockTag.poolIdx); sb.append(wakelockTag.poolIdx);
} }
} }
} }
@@ -6108,339 +6109,360 @@ public abstract class BatteryStats implements Parcelable {
public void printNextItem(PrintWriter pw, HistoryItem rec, long baseTime, boolean checkin, public void printNextItem(PrintWriter pw, HistoryItem rec, long baseTime, boolean checkin,
boolean verbose) { boolean verbose) {
pw.print(printNextItem(rec, baseTime, checkin, verbose));
}
/** Print the next history item to proto. */
public void printNextItem(ProtoOutputStream proto, HistoryItem rec, long baseTime,
boolean verbose) {
String item = printNextItem(rec, baseTime, true, verbose);
for (String line : item.split("\n")) {
proto.write(BatteryStatsServiceDumpHistoryProto.CSV_LINES, line);
}
}
private String printNextItem(HistoryItem rec, long baseTime, boolean checkin,
boolean verbose) {
StringBuilder item = new StringBuilder();
if (!checkin) { if (!checkin) {
pw.print(" "); item.append(" ");
TimeUtils.formatDuration(rec.time - baseTime, pw, TimeUtils.HUNDRED_DAY_FIELD_LEN); TimeUtils.formatDuration(
pw.print(" ("); rec.time - baseTime, item, TimeUtils.HUNDRED_DAY_FIELD_LEN);
pw.print(rec.numReadInts); item.append(" (");
pw.print(") "); item.append(rec.numReadInts);
item.append(") ");
} else { } else {
pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); item.append(BATTERY_STATS_CHECKIN_VERSION); item.append(',');
pw.print(HISTORY_DATA); pw.print(','); item.append(HISTORY_DATA); item.append(',');
if (lastTime < 0) { if (lastTime < 0) {
pw.print(rec.time - baseTime); item.append(rec.time - baseTime);
} else { } else {
pw.print(rec.time - lastTime); item.append(rec.time - lastTime);
} }
lastTime = rec.time; lastTime = rec.time;
} }
if (rec.cmd == HistoryItem.CMD_START) { if (rec.cmd == HistoryItem.CMD_START) {
if (checkin) { if (checkin) {
pw.print(":"); item.append(":");
} }
pw.println("START"); item.append("START\n");
reset(); reset();
} else if (rec.cmd == HistoryItem.CMD_CURRENT_TIME } else if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
|| rec.cmd == HistoryItem.CMD_RESET) { || rec.cmd == HistoryItem.CMD_RESET) {
if (checkin) { if (checkin) {
pw.print(":"); item.append(":");
} }
if (rec.cmd == HistoryItem.CMD_RESET) { if (rec.cmd == HistoryItem.CMD_RESET) {
pw.print("RESET:"); item.append("RESET:");
reset(); reset();
} }
pw.print("TIME:"); item.append("TIME:");
if (checkin) { if (checkin) {
pw.println(rec.currentTime); item.append(rec.currentTime);
item.append("\n");
} else { } else {
pw.print(" "); item.append(" ");
pw.println(DateFormat.format("yyyy-MM-dd-HH-mm-ss", item.append(DateFormat.format("yyyy-MM-dd-HH-mm-ss",
rec.currentTime).toString()); rec.currentTime).toString());
item.append("\n");
} }
} else if (rec.cmd == HistoryItem.CMD_SHUTDOWN) { } else if (rec.cmd == HistoryItem.CMD_SHUTDOWN) {
if (checkin) { if (checkin) {
pw.print(":"); item.append(":");
} }
pw.println("SHUTDOWN"); item.append("SHUTDOWN\n");
} else if (rec.cmd == HistoryItem.CMD_OVERFLOW) { } else if (rec.cmd == HistoryItem.CMD_OVERFLOW) {
if (checkin) { if (checkin) {
pw.print(":"); item.append(":");
} }
pw.println("*OVERFLOW*"); item.append("*OVERFLOW*\n");
} else { } else {
if (!checkin) { if (!checkin) {
if (rec.batteryLevel < 10) pw.print("00"); if (rec.batteryLevel < 10) item.append("00");
else if (rec.batteryLevel < 100) pw.print("0"); else if (rec.batteryLevel < 100) item.append("0");
pw.print(rec.batteryLevel); item.append(rec.batteryLevel);
if (verbose) { if (verbose) {
pw.print(" "); item.append(" ");
if (rec.states < 0) ; if (rec.states < 0) ;
else if (rec.states < 0x10) pw.print("0000000"); else if (rec.states < 0x10) item.append("0000000");
else if (rec.states < 0x100) pw.print("000000"); else if (rec.states < 0x100) item.append("000000");
else if (rec.states < 0x1000) pw.print("00000"); else if (rec.states < 0x1000) item.append("00000");
else if (rec.states < 0x10000) pw.print("0000"); else if (rec.states < 0x10000) item.append("0000");
else if (rec.states < 0x100000) pw.print("000"); else if (rec.states < 0x100000) item.append("000");
else if (rec.states < 0x1000000) pw.print("00"); else if (rec.states < 0x1000000) item.append("00");
else if (rec.states < 0x10000000) pw.print("0"); else if (rec.states < 0x10000000) item.append("0");
pw.print(Integer.toHexString(rec.states)); item.append(Integer.toHexString(rec.states));
} }
} else { } else {
if (oldLevel != rec.batteryLevel) { if (oldLevel != rec.batteryLevel) {
oldLevel = rec.batteryLevel; oldLevel = rec.batteryLevel;
pw.print(",Bl="); pw.print(rec.batteryLevel); item.append(",Bl="); item.append(rec.batteryLevel);
} }
} }
if (oldStatus != rec.batteryStatus) { if (oldStatus != rec.batteryStatus) {
oldStatus = rec.batteryStatus; oldStatus = rec.batteryStatus;
pw.print(checkin ? ",Bs=" : " status="); item.append(checkin ? ",Bs=" : " status=");
switch (oldStatus) { switch (oldStatus) {
case BatteryManager.BATTERY_STATUS_UNKNOWN: case BatteryManager.BATTERY_STATUS_UNKNOWN:
pw.print(checkin ? "?" : "unknown"); item.append(checkin ? "?" : "unknown");
break; break;
case BatteryManager.BATTERY_STATUS_CHARGING: case BatteryManager.BATTERY_STATUS_CHARGING:
pw.print(checkin ? "c" : "charging"); item.append(checkin ? "c" : "charging");
break; break;
case BatteryManager.BATTERY_STATUS_DISCHARGING: case BatteryManager.BATTERY_STATUS_DISCHARGING:
pw.print(checkin ? "d" : "discharging"); item.append(checkin ? "d" : "discharging");
break; break;
case BatteryManager.BATTERY_STATUS_NOT_CHARGING: case BatteryManager.BATTERY_STATUS_NOT_CHARGING:
pw.print(checkin ? "n" : "not-charging"); item.append(checkin ? "n" : "not-charging");
break; break;
case BatteryManager.BATTERY_STATUS_FULL: case BatteryManager.BATTERY_STATUS_FULL:
pw.print(checkin ? "f" : "full"); item.append(checkin ? "f" : "full");
break; break;
default: default:
pw.print(oldStatus); item.append(oldStatus);
break; break;
} }
} }
if (oldHealth != rec.batteryHealth) { if (oldHealth != rec.batteryHealth) {
oldHealth = rec.batteryHealth; oldHealth = rec.batteryHealth;
pw.print(checkin ? ",Bh=" : " health="); item.append(checkin ? ",Bh=" : " health=");
switch (oldHealth) { switch (oldHealth) {
case BatteryManager.BATTERY_HEALTH_UNKNOWN: case BatteryManager.BATTERY_HEALTH_UNKNOWN:
pw.print(checkin ? "?" : "unknown"); item.append(checkin ? "?" : "unknown");
break; break;
case BatteryManager.BATTERY_HEALTH_GOOD: case BatteryManager.BATTERY_HEALTH_GOOD:
pw.print(checkin ? "g" : "good"); item.append(checkin ? "g" : "good");
break; break;
case BatteryManager.BATTERY_HEALTH_OVERHEAT: case BatteryManager.BATTERY_HEALTH_OVERHEAT:
pw.print(checkin ? "h" : "overheat"); item.append(checkin ? "h" : "overheat");
break; break;
case BatteryManager.BATTERY_HEALTH_DEAD: case BatteryManager.BATTERY_HEALTH_DEAD:
pw.print(checkin ? "d" : "dead"); item.append(checkin ? "d" : "dead");
break; break;
case BatteryManager.BATTERY_HEALTH_OVER_VOLTAGE: case BatteryManager.BATTERY_HEALTH_OVER_VOLTAGE:
pw.print(checkin ? "v" : "over-voltage"); item.append(checkin ? "v" : "over-voltage");
break; break;
case BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE: case BatteryManager.BATTERY_HEALTH_UNSPECIFIED_FAILURE:
pw.print(checkin ? "f" : "failure"); item.append(checkin ? "f" : "failure");
break; break;
case BatteryManager.BATTERY_HEALTH_COLD: case BatteryManager.BATTERY_HEALTH_COLD:
pw.print(checkin ? "c" : "cold"); item.append(checkin ? "c" : "cold");
break; break;
default: default:
pw.print(oldHealth); item.append(oldHealth);
break; break;
} }
} }
if (oldPlug != rec.batteryPlugType) { if (oldPlug != rec.batteryPlugType) {
oldPlug = rec.batteryPlugType; oldPlug = rec.batteryPlugType;
pw.print(checkin ? ",Bp=" : " plug="); item.append(checkin ? ",Bp=" : " plug=");
switch (oldPlug) { switch (oldPlug) {
case 0: case 0:
pw.print(checkin ? "n" : "none"); item.append(checkin ? "n" : "none");
break; break;
case BatteryManager.BATTERY_PLUGGED_AC: case BatteryManager.BATTERY_PLUGGED_AC:
pw.print(checkin ? "a" : "ac"); item.append(checkin ? "a" : "ac");
break; break;
case BatteryManager.BATTERY_PLUGGED_USB: case BatteryManager.BATTERY_PLUGGED_USB:
pw.print(checkin ? "u" : "usb"); item.append(checkin ? "u" : "usb");
break; break;
case BatteryManager.BATTERY_PLUGGED_WIRELESS: case BatteryManager.BATTERY_PLUGGED_WIRELESS:
pw.print(checkin ? "w" : "wireless"); item.append(checkin ? "w" : "wireless");
break; break;
default: default:
pw.print(oldPlug); item.append(oldPlug);
break; break;
} }
} }
if (oldTemp != rec.batteryTemperature) { if (oldTemp != rec.batteryTemperature) {
oldTemp = rec.batteryTemperature; oldTemp = rec.batteryTemperature;
pw.print(checkin ? ",Bt=" : " temp="); item.append(checkin ? ",Bt=" : " temp=");
pw.print(oldTemp); item.append(oldTemp);
} }
if (oldVolt != rec.batteryVoltage) { if (oldVolt != rec.batteryVoltage) {
oldVolt = rec.batteryVoltage; oldVolt = rec.batteryVoltage;
pw.print(checkin ? ",Bv=" : " volt="); item.append(checkin ? ",Bv=" : " volt=");
pw.print(oldVolt); item.append(oldVolt);
} }
final int chargeMAh = rec.batteryChargeUAh / 1000; final int chargeMAh = rec.batteryChargeUAh / 1000;
if (oldChargeMAh != chargeMAh) { if (oldChargeMAh != chargeMAh) {
oldChargeMAh = chargeMAh; oldChargeMAh = chargeMAh;
pw.print(checkin ? ",Bcc=" : " charge="); item.append(checkin ? ",Bcc=" : " charge=");
pw.print(oldChargeMAh); item.append(oldChargeMAh);
} }
printBitDescriptions(pw, oldState, rec.states, rec.wakelockTag, printBitDescriptions(item, oldState, rec.states, rec.wakelockTag,
HISTORY_STATE_DESCRIPTIONS, !checkin); HISTORY_STATE_DESCRIPTIONS, !checkin);
printBitDescriptions(pw, oldState2, rec.states2, null, printBitDescriptions(item, oldState2, rec.states2, null,
HISTORY_STATE2_DESCRIPTIONS, !checkin); HISTORY_STATE2_DESCRIPTIONS, !checkin);
if (rec.wakeReasonTag != null) { if (rec.wakeReasonTag != null) {
if (checkin) { if (checkin) {
pw.print(",wr="); item.append(",wr=");
pw.print(rec.wakeReasonTag.poolIdx); item.append(rec.wakeReasonTag.poolIdx);
} else { } else {
pw.print(" wake_reason="); item.append(" wake_reason=");
pw.print(rec.wakeReasonTag.uid); item.append(rec.wakeReasonTag.uid);
pw.print(":\""); item.append(":\"");
pw.print(rec.wakeReasonTag.string); item.append(rec.wakeReasonTag.string);
pw.print("\""); item.append("\"");
} }
} }
if (rec.eventCode != HistoryItem.EVENT_NONE) { if (rec.eventCode != HistoryItem.EVENT_NONE) {
pw.print(checkin ? "," : " "); item.append(checkin ? "," : " ");
if ((rec.eventCode&HistoryItem.EVENT_FLAG_START) != 0) { if ((rec.eventCode&HistoryItem.EVENT_FLAG_START) != 0) {
pw.print("+"); item.append("+");
} else if ((rec.eventCode&HistoryItem.EVENT_FLAG_FINISH) != 0) { } else if ((rec.eventCode&HistoryItem.EVENT_FLAG_FINISH) != 0) {
pw.print("-"); item.append("-");
} }
String[] eventNames = checkin ? HISTORY_EVENT_CHECKIN_NAMES String[] eventNames = checkin ? HISTORY_EVENT_CHECKIN_NAMES
: HISTORY_EVENT_NAMES; : HISTORY_EVENT_NAMES;
int idx = rec.eventCode & ~(HistoryItem.EVENT_FLAG_START int idx = rec.eventCode & ~(HistoryItem.EVENT_FLAG_START
| HistoryItem.EVENT_FLAG_FINISH); | HistoryItem.EVENT_FLAG_FINISH);
if (idx >= 0 && idx < eventNames.length) { if (idx >= 0 && idx < eventNames.length) {
pw.print(eventNames[idx]); item.append(eventNames[idx]);
} else { } else {
pw.print(checkin ? "Ev" : "event"); item.append(checkin ? "Ev" : "event");
pw.print(idx); item.append(idx);
} }
pw.print("="); item.append("=");
if (checkin) { if (checkin) {
pw.print(rec.eventTag.poolIdx); item.append(rec.eventTag.poolIdx);
} else { } else {
pw.append(HISTORY_EVENT_INT_FORMATTERS[idx] item.append(HISTORY_EVENT_INT_FORMATTERS[idx]
.applyAsString(rec.eventTag.uid)); .applyAsString(rec.eventTag.uid));
pw.print(":\""); item.append(":\"");
pw.print(rec.eventTag.string); item.append(rec.eventTag.string);
pw.print("\""); item.append("\"");
} }
} }
pw.println(); item.append("\n");
if (rec.stepDetails != null) { if (rec.stepDetails != null) {
if (!checkin) { if (!checkin) {
pw.print(" Details: cpu="); item.append(" Details: cpu=");
pw.print(rec.stepDetails.userTime); item.append(rec.stepDetails.userTime);
pw.print("u+"); item.append("u+");
pw.print(rec.stepDetails.systemTime); item.append(rec.stepDetails.systemTime);
pw.print("s"); item.append("s");
if (rec.stepDetails.appCpuUid1 >= 0) { if (rec.stepDetails.appCpuUid1 >= 0) {
pw.print(" ("); item.append(" (");
printStepCpuUidDetails(pw, rec.stepDetails.appCpuUid1, printStepCpuUidDetails(item, rec.stepDetails.appCpuUid1,
rec.stepDetails.appCpuUTime1, rec.stepDetails.appCpuSTime1); rec.stepDetails.appCpuUTime1, rec.stepDetails.appCpuSTime1);
if (rec.stepDetails.appCpuUid2 >= 0) { if (rec.stepDetails.appCpuUid2 >= 0) {
pw.print(", "); item.append(", ");
printStepCpuUidDetails(pw, rec.stepDetails.appCpuUid2, printStepCpuUidDetails(item, rec.stepDetails.appCpuUid2,
rec.stepDetails.appCpuUTime2, rec.stepDetails.appCpuSTime2); rec.stepDetails.appCpuUTime2, rec.stepDetails.appCpuSTime2);
} }
if (rec.stepDetails.appCpuUid3 >= 0) { if (rec.stepDetails.appCpuUid3 >= 0) {
pw.print(", "); item.append(", ");
printStepCpuUidDetails(pw, rec.stepDetails.appCpuUid3, printStepCpuUidDetails(item, rec.stepDetails.appCpuUid3,
rec.stepDetails.appCpuUTime3, rec.stepDetails.appCpuSTime3); rec.stepDetails.appCpuUTime3, rec.stepDetails.appCpuSTime3);
} }
pw.print(')'); item.append(')');
} }
pw.println(); item.append("\n");
pw.print(" /proc/stat="); item.append(" /proc/stat=");
pw.print(rec.stepDetails.statUserTime); item.append(rec.stepDetails.statUserTime);
pw.print(" usr, "); item.append(" usr, ");
pw.print(rec.stepDetails.statSystemTime); item.append(rec.stepDetails.statSystemTime);
pw.print(" sys, "); item.append(" sys, ");
pw.print(rec.stepDetails.statIOWaitTime); item.append(rec.stepDetails.statIOWaitTime);
pw.print(" io, "); item.append(" io, ");
pw.print(rec.stepDetails.statIrqTime); item.append(rec.stepDetails.statIrqTime);
pw.print(" irq, "); item.append(" irq, ");
pw.print(rec.stepDetails.statSoftIrqTime); item.append(rec.stepDetails.statSoftIrqTime);
pw.print(" sirq, "); item.append(" sirq, ");
pw.print(rec.stepDetails.statIdlTime); item.append(rec.stepDetails.statIdlTime);
pw.print(" idle"); item.append(" idle");
int totalRun = rec.stepDetails.statUserTime + rec.stepDetails.statSystemTime int totalRun = rec.stepDetails.statUserTime + rec.stepDetails.statSystemTime
+ rec.stepDetails.statIOWaitTime + rec.stepDetails.statIrqTime + rec.stepDetails.statIOWaitTime + rec.stepDetails.statIrqTime
+ rec.stepDetails.statSoftIrqTime; + rec.stepDetails.statSoftIrqTime;
int total = totalRun + rec.stepDetails.statIdlTime; int total = totalRun + rec.stepDetails.statIdlTime;
if (total > 0) { if (total > 0) {
pw.print(" ("); item.append(" (");
float perc = ((float)totalRun) / ((float)total) * 100; float perc = ((float)totalRun) / ((float)total) * 100;
pw.print(String.format("%.1f%%", perc)); item.append(String.format("%.1f%%", perc));
pw.print(" of "); item.append(" of ");
StringBuilder sb = new StringBuilder(64); StringBuilder sb = new StringBuilder(64);
formatTimeMsNoSpace(sb, total*10); formatTimeMsNoSpace(sb, total*10);
pw.print(sb); item.append(sb);
pw.print(")"); item.append(")");
} }
pw.print(", PlatformIdleStat "); item.append(", PlatformIdleStat ");
pw.print(rec.stepDetails.statPlatformIdleState); item.append(rec.stepDetails.statPlatformIdleState);
pw.println(); item.append("\n");
pw.print(", SubsystemPowerState "); item.append(", SubsystemPowerState ");
pw.print(rec.stepDetails.statSubsystemPowerState); item.append(rec.stepDetails.statSubsystemPowerState);
pw.println(); item.append("\n");
} else { } else {
pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); item.append(BATTERY_STATS_CHECKIN_VERSION); item.append(',');
pw.print(HISTORY_DATA); pw.print(",0,Dcpu="); item.append(HISTORY_DATA); item.append(",0,Dcpu=");
pw.print(rec.stepDetails.userTime); item.append(rec.stepDetails.userTime);
pw.print(":"); item.append(":");
pw.print(rec.stepDetails.systemTime); item.append(rec.stepDetails.systemTime);
if (rec.stepDetails.appCpuUid1 >= 0) { if (rec.stepDetails.appCpuUid1 >= 0) {
printStepCpuUidCheckinDetails(pw, rec.stepDetails.appCpuUid1, printStepCpuUidCheckinDetails(item, rec.stepDetails.appCpuUid1,
rec.stepDetails.appCpuUTime1, rec.stepDetails.appCpuSTime1); rec.stepDetails.appCpuUTime1, rec.stepDetails.appCpuSTime1);
if (rec.stepDetails.appCpuUid2 >= 0) { if (rec.stepDetails.appCpuUid2 >= 0) {
printStepCpuUidCheckinDetails(pw, rec.stepDetails.appCpuUid2, printStepCpuUidCheckinDetails(item, rec.stepDetails.appCpuUid2,
rec.stepDetails.appCpuUTime2, rec.stepDetails.appCpuSTime2); rec.stepDetails.appCpuUTime2, rec.stepDetails.appCpuSTime2);
} }
if (rec.stepDetails.appCpuUid3 >= 0) { if (rec.stepDetails.appCpuUid3 >= 0) {
printStepCpuUidCheckinDetails(pw, rec.stepDetails.appCpuUid3, printStepCpuUidCheckinDetails(item, rec.stepDetails.appCpuUid3,
rec.stepDetails.appCpuUTime3, rec.stepDetails.appCpuSTime3); rec.stepDetails.appCpuUTime3, rec.stepDetails.appCpuSTime3);
} }
} }
pw.println(); item.append("\n");
pw.print(BATTERY_STATS_CHECKIN_VERSION); pw.print(','); item.append(BATTERY_STATS_CHECKIN_VERSION); item.append(',');
pw.print(HISTORY_DATA); pw.print(",0,Dpst="); item.append(HISTORY_DATA); item.append(",0,Dpst=");
pw.print(rec.stepDetails.statUserTime); item.append(rec.stepDetails.statUserTime);
pw.print(','); item.append(',');
pw.print(rec.stepDetails.statSystemTime); item.append(rec.stepDetails.statSystemTime);
pw.print(','); item.append(',');
pw.print(rec.stepDetails.statIOWaitTime); item.append(rec.stepDetails.statIOWaitTime);
pw.print(','); item.append(',');
pw.print(rec.stepDetails.statIrqTime); item.append(rec.stepDetails.statIrqTime);
pw.print(','); item.append(',');
pw.print(rec.stepDetails.statSoftIrqTime); item.append(rec.stepDetails.statSoftIrqTime);
pw.print(','); item.append(',');
pw.print(rec.stepDetails.statIdlTime); item.append(rec.stepDetails.statIdlTime);
pw.print(','); item.append(',');
if (rec.stepDetails.statPlatformIdleState != null) { if (rec.stepDetails.statPlatformIdleState != null) {
pw.print(rec.stepDetails.statPlatformIdleState); item.append(rec.stepDetails.statPlatformIdleState);
if (rec.stepDetails.statSubsystemPowerState != null) { if (rec.stepDetails.statSubsystemPowerState != null) {
pw.print(','); item.append(',');
} }
} }
if (rec.stepDetails.statSubsystemPowerState != null) { if (rec.stepDetails.statSubsystemPowerState != null) {
pw.print(rec.stepDetails.statSubsystemPowerState); item.append(rec.stepDetails.statSubsystemPowerState);
} }
pw.println(); item.append("\n");
} }
} }
oldState = rec.states; oldState = rec.states;
oldState2 = rec.states2; oldState2 = rec.states2;
} }
return item.toString();
} }
private void printStepCpuUidDetails(PrintWriter pw, int uid, int utime, int stime) { private void printStepCpuUidDetails(StringBuilder sb, int uid, int utime, int stime) {
UserHandle.formatUid(pw, uid); UserHandle.formatUid(sb, uid);
pw.print("="); sb.append("=");
pw.print(utime); sb.append(utime);
pw.print("u+"); sb.append("u+");
pw.print(stime); sb.append(stime);
pw.print("s"); sb.append("s");
} }
private void printStepCpuUidCheckinDetails(PrintWriter pw, int uid, int utime, int stime) { private void printStepCpuUidCheckinDetails(StringBuilder sb, int uid, int utime,
pw.print('/'); int stime) {
pw.print(uid); sb.append('/');
pw.print(":"); sb.append(uid);
pw.print(utime); sb.append(":");
pw.print(":"); sb.append(utime);
pw.print(stime); sb.append(":");
sb.append(stime);
} }
} }
@@ -7046,21 +7068,30 @@ public abstract class BatteryStats implements Parcelable {
} }
} }
/** Dump #STATS_SINCE_CHARGED batterystats data to a proto. @hide */ /**
* Dump #STATS_SINCE_CHARGED batterystats data to a proto. If the flags include
* DUMP_INCLUDE_HISTORY or DUMP_HISTORY_ONLY, only the history will be dumped.
* @hide
*/
public void dumpProtoLocked(Context context, FileDescriptor fd, List<ApplicationInfo> apps, public void dumpProtoLocked(Context context, FileDescriptor fd, List<ApplicationInfo> apps,
int flags) { int flags, long histStart) {
final ProtoOutputStream proto = new ProtoOutputStream(fd); final ProtoOutputStream proto = new ProtoOutputStream(fd);
final long bToken = proto.start(BatteryStatsServiceDumpProto.BATTERYSTATS);
prepareForDumpLocked(); prepareForDumpLocked();
if ((flags & (DUMP_INCLUDE_HISTORY | DUMP_HISTORY_ONLY)) != 0) {
dumpProtoHistoryLocked(proto, flags, histStart);
proto.flush();
return;
}
final long bToken = proto.start(BatteryStatsServiceDumpProto.BATTERYSTATS);
proto.write(BatteryStatsProto.REPORT_VERSION, CHECKIN_VERSION); proto.write(BatteryStatsProto.REPORT_VERSION, CHECKIN_VERSION);
proto.write(BatteryStatsProto.PARCEL_VERSION, getParcelVersion()); proto.write(BatteryStatsProto.PARCEL_VERSION, getParcelVersion());
proto.write(BatteryStatsProto.START_PLATFORM_VERSION, getStartPlatformVersion()); proto.write(BatteryStatsProto.START_PLATFORM_VERSION, getStartPlatformVersion());
proto.write(BatteryStatsProto.END_PLATFORM_VERSION, getEndPlatformVersion()); proto.write(BatteryStatsProto.END_PLATFORM_VERSION, getEndPlatformVersion());
// History intentionally not included in proto dump. if ((flags & DUMP_DAILY_ONLY) == 0) {
if ((flags & (DUMP_HISTORY_ONLY | DUMP_DAILY_ONLY)) == 0) {
final BatteryStatsHelper helper = new BatteryStatsHelper(context, false, final BatteryStatsHelper helper = new BatteryStatsHelper(context, false,
(flags & DUMP_DEVICE_WIFI_ONLY) != 0); (flags & DUMP_DEVICE_WIFI_ONLY) != 0);
helper.create(this); helper.create(this);
@@ -7530,6 +7561,108 @@ public abstract class BatteryStats implements Parcelable {
} }
} }
private void dumpProtoHistoryLocked(ProtoOutputStream proto, int flags, long histStart) {
if (!startIteratingHistoryLocked()) {
return;
}
proto.write(BatteryStatsServiceDumpHistoryProto.REPORT_VERSION, CHECKIN_VERSION);
proto.write(BatteryStatsServiceDumpHistoryProto.PARCEL_VERSION, getParcelVersion());
proto.write(BatteryStatsServiceDumpHistoryProto.START_PLATFORM_VERSION,
getStartPlatformVersion());
proto.write(BatteryStatsServiceDumpHistoryProto.END_PLATFORM_VERSION,
getEndPlatformVersion());
try {
long token;
// History string pool (HISTORY_STRING_POOL)
for (int i = 0; i < getHistoryStringPoolSize(); ++i) {
token = proto.start(BatteryStatsServiceDumpHistoryProto.KEYS);
proto.write(BatteryStatsServiceDumpHistoryProto.Key.INDEX, i);
proto.write(BatteryStatsServiceDumpHistoryProto.Key.UID, getHistoryTagPoolUid(i));
proto.write(BatteryStatsServiceDumpHistoryProto.Key.TAG,
getHistoryTagPoolString(i));
proto.end(token);
}
// History data (HISTORY_DATA)
final HistoryPrinter hprinter = new HistoryPrinter();
final HistoryItem rec = new HistoryItem();
long lastTime = -1;
long baseTime = -1;
boolean printed = false;
HistoryEventTracker tracker = null;
while (getNextHistoryLocked(rec)) {
lastTime = rec.time;
if (baseTime < 0) {
baseTime = lastTime;
}
if (rec.time >= histStart) {
if (histStart >= 0 && !printed) {
if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
|| rec.cmd == HistoryItem.CMD_RESET
|| rec.cmd == HistoryItem.CMD_START
|| rec.cmd == HistoryItem.CMD_SHUTDOWN) {
printed = true;
hprinter.printNextItem(proto, rec, baseTime,
(flags & DUMP_VERBOSE) != 0);
rec.cmd = HistoryItem.CMD_UPDATE;
} else if (rec.currentTime != 0) {
printed = true;
byte cmd = rec.cmd;
rec.cmd = HistoryItem.CMD_CURRENT_TIME;
hprinter.printNextItem(proto, rec, baseTime,
(flags & DUMP_VERBOSE) != 0);
rec.cmd = cmd;
}
if (tracker != null) {
if (rec.cmd != HistoryItem.CMD_UPDATE) {
hprinter.printNextItem(proto, rec, baseTime,
(flags & DUMP_VERBOSE) != 0);
rec.cmd = HistoryItem.CMD_UPDATE;
}
int oldEventCode = rec.eventCode;
HistoryTag oldEventTag = rec.eventTag;
rec.eventTag = new HistoryTag();
for (int i = 0; i < HistoryItem.EVENT_COUNT; i++) {
HashMap<String, SparseIntArray> active =
tracker.getStateForEvent(i);
if (active == null) {
continue;
}
for (HashMap.Entry<String, SparseIntArray> ent
: active.entrySet()) {
SparseIntArray uids = ent.getValue();
for (int j = 0; j < uids.size(); j++) {
rec.eventCode = i;
rec.eventTag.string = ent.getKey();
rec.eventTag.uid = uids.keyAt(j);
rec.eventTag.poolIdx = uids.valueAt(j);
hprinter.printNextItem(proto, rec, baseTime,
(flags & DUMP_VERBOSE) != 0);
rec.wakeReasonTag = null;
rec.wakelockTag = null;
}
}
}
rec.eventCode = oldEventCode;
rec.eventTag = oldEventTag;
tracker = null;
}
}
hprinter.printNextItem(proto, rec, baseTime,
(flags & DUMP_VERBOSE) != 0);
}
}
if (histStart >= 0) {
commitCurrentHistoryBatchLocked();
proto.write(BatteryStatsServiceDumpHistoryProto.CSV_LINES,
"NEXT: " + (lastTime + 1));
}
} finally {
finishIteratingHistoryLocked();
}
}
private void dumpProtoSystemLocked(ProtoOutputStream proto, BatteryStatsHelper helper) { private void dumpProtoSystemLocked(ProtoOutputStream proto, BatteryStatsHelper helper) {
final long sToken = proto.start(BatteryStatsProto.SYSTEM); final long sToken = proto.start(BatteryStatsProto.SYSTEM);
final long rawUptimeUs = SystemClock.uptimeMillis() * 1000; final long rawUptimeUs = SystemClock.uptimeMillis() * 1000;

8
core/java/android/util/TimeUtils.java
View File

@@ -239,6 +239,14 @@ public class TimeUtils {
} }
} }
/** @hide Just for debugging; not internationalized. */
public static void formatDuration(long duration, StringBuilder builder, int fieldLen) {
synchronized (sFormatSync) {
int len = formatDurationLocked(duration, fieldLen);
builder.append(sFormatStr, 0, len);
}
}
/** @hide Just for debugging; not internationalized. */ /** @hide Just for debugging; not internationalized. */
public static void formatDuration(long duration, PrintWriter pw, int fieldLen) { public static void formatDuration(long duration, PrintWriter pw, int fieldLen) {
synchronized (sFormatSync) { synchronized (sFormatSync) {

9
core/proto/android/os/incident.proto
View File

@@ -18,6 +18,7 @@ syntax = "proto2";
option java_multiple_files = true; option java_multiple_files = true;
import "frameworks/base/core/proto/android/os/backtrace.proto"; import "frameworks/base/core/proto/android/os/backtrace.proto";
import "frameworks/base/core/proto/android/os/batterystats.proto";
import "frameworks/base/core/proto/android/os/batterytype.proto"; import "frameworks/base/core/proto/android/os/batterytype.proto";
import "frameworks/base/core/proto/android/os/cpufreq.proto"; import "frameworks/base/core/proto/android/os/cpufreq.proto";
import "frameworks/base/core/proto/android/os/cpuinfo.proto"; import "frameworks/base/core/proto/android/os/cpuinfo.proto";
@@ -289,6 +290,14 @@ message IncidentProto {
(section).args = "usb --proto" (section).args = "usb --proto"
]; ];
// The history can be large and may cause issues in consumers, so put the
// history in a separate section to compensate.
optional android.service.batterystats.BatteryStatsServiceDumpHistoryProto battery_history = 3022 [
(section).type = SECTION_DUMPSYS,
(section).args = "batterystats --proto --history",
(section).userdebug_and_eng_only = true
];
// Reserved for OEMs. // Reserved for OEMs.
extensions 50000 to 100000; extensions 50000 to 100000;
} }

26
core/proto/android/service/batterystats.proto
View File

@@ -23,8 +23,34 @@ option java_outer_classname = "BatteryStatsServiceProto";
import "frameworks/base/core/proto/android/os/batterystats.proto"; import "frameworks/base/core/proto/android/os/batterystats.proto";
import "frameworks/base/libs/incident/proto/android/privacy.proto"; import "frameworks/base/libs/incident/proto/android/privacy.proto";
// Dump of batterystats aggregate data (dumpsys batterystats --proto).
message BatteryStatsServiceDumpProto { message BatteryStatsServiceDumpProto {
option (android.msg_privacy).dest = DEST_AUTOMATIC; option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional android.os.BatteryStatsProto batterystats = 1; optional android.os.BatteryStatsProto batterystats = 1;
} }
// Dump of batterystats history data (dumpsys batterystats --proto --history).
message BatteryStatsServiceDumpHistoryProto {
option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 report_version = 1;
optional int64 parcel_version = 2;
optional string start_platform_version = 3;
optional string end_platform_version = 4;
// HistoryStringPool data
message Key {
option (android.msg_privacy).dest = DEST_AUTOMATIC;
optional int32 index = 1;
// Not valid for all keys.
optional int32 uid = 2;
optional string tag = 3;
}
repeated Key keys = 5;
// Dump of battery history in csv format (equivalent of
// 'batterystats -c --history', with the hsp lines extracted).
repeated string csv_lines = 6;
}

3
libs/incident/proto/android/section.proto
View File

@@ -52,6 +52,9 @@ message SectionFlags {
optional SectionType type = 1 [default = SECTION_NONE]; optional SectionType type = 1 [default = SECTION_NONE];
optional string args = 2; optional string args = 2;
optional bool device_specific = 3 [default = false]; optional bool device_specific = 3 [default = false];
// If true, then the section will only be generated for userdebug and eng
// builds.
optional bool userdebug_and_eng_only = 4 [default = false];
} }
extend google.protobuf.FieldOptions { extend google.protobuf.FieldOptions {

8
services/core/java/com/android/server/am/BatteryStatsService.java
View File

@@ -1214,11 +1214,12 @@ public final class BatteryStatsService extends IBatteryStats.Stub
private void dumpHelp(PrintWriter pw) { private void dumpHelp(PrintWriter pw) {
pw.println("Battery stats (batterystats) dump options:"); pw.println("Battery stats (batterystats) dump options:");
pw.println(" [--checkin] [--history] [--history-start] [--charged] [-c]"); pw.println(" [--checkin] [--proto] [--history] [--history-start] [--charged] [-c]");
pw.println(" [--daily] [--reset] [--write] [--new-daily] [--read-daily] [-h] [<package.name>]"); pw.println(" [--daily] [--reset] [--write] [--new-daily] [--read-daily] [-h] [<package.name>]");
pw.println(" --checkin: generate output for a checkin report; will write (and clear) the"); pw.println(" --checkin: generate output for a checkin report; will write (and clear) the");
pw.println(" last old completed stats when they had been reset."); pw.println(" last old completed stats when they had been reset.");
pw.println(" -c: write the current stats in checkin format."); pw.println(" -c: write the current stats in checkin format.");
pw.println(" --proto: write the current aggregate stats (without history) in proto format.");
pw.println(" --history: show only history data."); pw.println(" --history: show only history data.");
pw.println(" --history-start <num>: show only history data starting at given time offset."); pw.println(" --history-start <num>: show only history data starting at given time offset.");
pw.println(" --charged: only output data since last charged."); pw.println(" --charged: only output data since last charged.");
@@ -1431,7 +1432,8 @@ public final class BatteryStatsService extends IBatteryStats.Stub
null, mStats.mHandler, null, mUserManagerUserInfoProvider); null, mStats.mHandler, null, mUserManagerUserInfoProvider);
checkinStats.readSummaryFromParcel(in); checkinStats.readSummaryFromParcel(in);
in.recycle(); in.recycle();
checkinStats.dumpProtoLocked(mContext, fd, apps, flags); checkinStats.dumpProtoLocked(
mContext, fd, apps, flags, historyStart);
mStats.mCheckinFile.delete(); mStats.mCheckinFile.delete();
return; return;
} }
@@ -1444,7 +1446,7 @@ public final class BatteryStatsService extends IBatteryStats.Stub
} }
if (DBG) Slog.d(TAG, "begin dumpProtoLocked from UID " + Binder.getCallingUid()); if (DBG) Slog.d(TAG, "begin dumpProtoLocked from UID " + Binder.getCallingUid());
synchronized (mStats) { synchronized (mStats) {
mStats.dumpProtoLocked(mContext, fd, apps, flags); mStats.dumpProtoLocked(mContext, fd, apps, flags, historyStart);
if (writeData) { if (writeData) {
mStats.writeAsyncLocked(); mStats.writeAsyncLocked();
} }

6
tools/incident_section_gen/main.cpp
View File

@@ -14,13 +14,12 @@
* limitations under the License. * limitations under the License.
*/ */
#include <frameworks/base/core/proto/android/os/incident.pb.h> #include <frameworks/base/core/proto/android/os/incident.pb.h>
#include <map> #include <map>
#include <set> #include <set>
#include <string>
#include <sstream> #include <sstream>
#include <string>
using namespace android; using namespace android;
using namespace android::os; using namespace android::os;
@@ -422,7 +421,8 @@ static bool generateSectionListCpp(Descriptor const* descriptor) {
printf(" NULL),\n"); printf(" NULL),\n");
break; break;
case SECTION_DUMPSYS: case SECTION_DUMPSYS:
printf(" new DumpsysSection(%d,", field->number()); printf(" new DumpsysSection(%d, \"%s\",", field->number(),
s.userdebug_and_eng_only() ? "true" : "false");
splitAndPrint(s.args()); splitAndPrint(s.args());
printf(" NULL),\n"); printf(" NULL),\n");
break; break;