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

Merge "Fix format of subsystem power stats" into oc-dr1-dev

Browse Source 
am: 5512504bba

Change-Id: I3f6b818d34a2a54f73a7192d10d462b68d6e6ed0
This commit is contained in:
Ahmed ElArabawy
2017-07-20 02:43:54 +00:00
committed by android-build-merger
parent bc5b6f4124 5512504bba
commit fe4ec9e946
2 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5606,8 +5606,10 @@ public abstract class BatteryStats implements Parcelable {
pw.print(',');
if (rec.stepDetails.statPlatformIdleState != null) {
pw.print(rec.stepDetails.statPlatformIdleState);
if (rec.stepDetails.statSubsystemPowerState != null) {
pw.print(',');
}
}
pw.println();
if (rec.stepDetails.statSubsystemPowerState != null) {
pw.print(rec.stepDetails.statSubsystemPowerState);

58
services/core/jni/com_android_server_am_BatteryStatsService.cpp
View File

@@ -301,30 +301,17 @@ static jint getSubsystemLowPowerStats(JNIEnv* env, jobject /* clazz */, jobject
if (status != Status::SUCCESS)
return;
for (size_t i = 0; i < subsystems.size(); i++) {
int added;
const PowerStateSubsystem &subsystem = subsystems[i];
added = snprintf(offset, remaining,
"subsystem_%zu name=%s ", i + 1, subsystem.name.c_str());
if (added < 0) {
break;
}
if (added > remaining) {
added = remaining;
}
if (subsystems.size() > 0) {
int added = snprintf(offset, remaining, "SubsystemPowerState ");
offset += added;
remaining -= added;
total_added += added;
for (size_t j = 0; j < subsystem.states.size(); j++) {
const PowerStateSubsystemSleepState& state = subsystem.states[j];
for (size_t i = 0; i < subsystems.size(); i++) {
const PowerStateSubsystem &subsystem = subsystems[i];
added = snprintf(offset, remaining,
"state_%zu name=%s time=%" PRIu64 " count=%" PRIu64 " last entry TS(ms)=%" PRIu64 " ",
j + 1, state.name.c_str(), state.residencyInMsecSinceBoot,
state.totalTransitions, state.lastEntryTimestampMs);
"subsystem_%zu name=%s ", i + 1, subsystem.name.c_str());
if (added < 0) {
break;
}
@@ -336,14 +323,33 @@ static jint getSubsystemLowPowerStats(JNIEnv* env, jobject /* clazz */, jobject
offset += added;
remaining -= added;
total_added += added;
}
if (remaining <= 0) {
/* rewrite NULL character*/
offset--;
total_added--;
ALOGE("PowerHal: buffer not enough");
break;
for (size_t j = 0; j < subsystem.states.size(); j++) {
const PowerStateSubsystemSleepState& state = subsystem.states[j];
added = snprintf(offset, remaining,
"state_%zu name=%s time=%" PRIu64 " count=%" PRIu64 " last entry=%" PRIu64 " ",
j + 1, state.name.c_str(), state.residencyInMsecSinceBoot,
state.totalTransitions, state.lastEntryTimestampMs);
if (added < 0) {
break;
}
if (added > remaining) {
added = remaining;
}
offset += added;
remaining -= added;
total_added += added;
}
if (remaining <= 0) {
/* rewrite NULL character*/
offset--;
total_added--;
ALOGE("PowerHal: buffer not enough");
break;
}
}
}
}