diff options
| author | Ahmed ElArabawy <arabawy@google.com> | 2017-07-20 02:43:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 02:43:54 +0000 |
| commit | fe4ec9e9465eb4859845aeea5f1dfbb70b4c9d00 (patch) | |
| tree | b344b514c8f24311cfe3dfb5823ec7d785f59f9c | |
| parent | bc5b6f412455c5c31addf415d65b0ce3fb89ad12 (diff) | |
| parent | 5512504bba679ad14f9df31d6583bbf241a64381 (diff) | |
Merge "Fix format of subsystem power stats" into oc-dr1-dev
am: 5512504bba
Change-Id: I3f6b818d34a2a54f73a7192d10d462b68d6e6ed0
| -rw-r--r-- | core/java/android/os/BatteryStats.java | 4 | ||||
| -rw-r--r-- | services/core/jni/com_android_server_am_BatteryStatsService.cpp | 58 |
2 files changed, 35 insertions, 27 deletions
diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index b178d814a3f7..19fb15c56d40 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -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); diff --git a/services/core/jni/com_android_server_am_BatteryStatsService.cpp b/services/core/jni/com_android_server_am_BatteryStatsService.cpp index 2dfd8b9fa163..413f430a7e42 100644 --- a/services/core/jni/com_android_server_am_BatteryStatsService.cpp +++ b/services/core/jni/com_android_server_am_BatteryStatsService.cpp @@ -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; + } } } } |