From 7cea50775dff2a641cdc794fd7a72263d2027ffe Mon Sep 17 00:00:00 2001 From: mxyyiyi Date: Fri, 29 Mar 2024 14:49:20 +0800 Subject: [PATCH] Update logs of BatteryEntry & BatteryHistEntry Bug: 331426391 Test: manual Change-Id: I2825cecbaab35b3ef4a645a9e2d57f579d88ef19 --- .../fuelgauge/batteryusage/BatteryEntry.java | 43 +++++++++++ .../batteryusage/BatteryHistEntry.java | 73 ++++++++++--------- 2 files changed, 81 insertions(+), 35 deletions(-) diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java index 4b65cc9c116..ddb8ecbe577 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java @@ -40,6 +40,7 @@ import android.util.Log; import com.android.settings.R; import com.android.settings.fuelgauge.BatteryUtils; import com.android.settingslib.Utils; +import com.android.settingslib.utils.StringUtil; import java.util.Comparator; import java.util.Locale; @@ -655,4 +656,46 @@ public class BatteryEntry { return 0.0d; } } + + @Override + public String toString() { + return new StringBuilder() + .append("BatteryEntry{") + .append(String.format("\n\tname=%s isHidden=%b", mName, mIsHidden)) + .append(String.format("\n\tconsume=%.2f%% | %f", mPercent, mConsumedPower)) + .append( + String.format( + "\n\tconsume power= foreground:%f foregroundService:%f", + mConsumedPowerInForeground, mConsumedPowerInForegroundService)) + .append( + String.format( + "\n\tconsume power= background:%f cached:%f", + mConsumedPowerInBackground, mConsumedPowerInCached)) + .append( + String.format( + "\n\ttime= foreground:%s foregroundService:%s " + + "background:%s usageDuration:%s", + StringUtil.formatElapsedTime( + mContext, + (double) mTimeInForegroundMs, + /* withSeconds= */ true, + /* collapseTimeUnit= */ false), + StringUtil.formatElapsedTime( + mContext, + (double) mTimeInForegroundServiceMs, + /* withSeconds= */ true, + /* collapseTimeUnit= */ false), + StringUtil.formatElapsedTime( + mContext, + (double) mTimeInBackgroundMs, + /* withSeconds= */ true, + /* collapseTimeUnit= */ false), + StringUtil.formatElapsedTime( + mContext, + (double) mUsageDurationMs, + /* withSeconds= */ true, + /* collapseTimeUnit= */ false))) + .append(String.format("\n\tpackage:%s uid:%d", mDefaultPackageName, mUid)) + .toString(); + } } diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java index b42d3733f00..dbe98bcc460 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java +++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java @@ -192,41 +192,44 @@ public class BatteryHistEntry { @Override public String toString() { final String recordAtDateTime = ConvertUtils.utcToLocalTimeForLogging(mTimestamp); - final StringBuilder builder = new StringBuilder(); - builder.append("\nBatteryHistEntry{"); - builder.append( - String.format( - "\n\tpackage=%s|label=%s|uid=%d|userId=%d|isHidden=%b", - mPackageName, mAppLabel, mUid, mUserId, mIsHidden)); - builder.append( - String.format( - "\n\ttimestamp=%s|zoneId=%s|bootTimestamp=%d", - recordAtDateTime, mZoneId, TimestampUtils.getSeconds(mBootTimestamp))); - builder.append( - String.format( - "\n\tusage=%f|total=%f|consume=%f", - mPercentOfTotal, mTotalPower, mConsumePower)); - builder.append( - String.format( - "\n\tforeground=%f|foregroundService=%f", - mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower)); - builder.append( - String.format( - "\n\tbackground=%f|cached=%f", - mBackgroundUsageConsumePower, mCachedUsageConsumePower)); - builder.append( - String.format( - "\n\telapsedTime,fg=%d|fgs=%d|bg=%d", - TimestampUtils.getSeconds(mBackgroundUsageTimeInMs), - TimestampUtils.getSeconds(mForegroundServiceUsageTimeInMs), - TimestampUtils.getSeconds(mBackgroundUsageTimeInMs))); - builder.append( - String.format("\n\tdrainType=%d|consumerType=%d", mDrainType, mConsumerType)); - builder.append( - String.format( - "\n\tbattery=%d|status=%d|health=%d\n}", - mBatteryLevel, mBatteryStatus, mBatteryHealth)); - return builder.toString(); + return new StringBuilder() + .append("\nBatteryHistEntry{") + .append( + String.format( + "\n\tpackage=%s|label=%s|uid=%d|userId=%d|isHidden=%b", + mPackageName, mAppLabel, mUid, mUserId, mIsHidden)) + .append( + String.format( + "\n\ttimestamp=%s|zoneId=%s|bootTimestamp=%d", + recordAtDateTime, + mZoneId, + TimestampUtils.getSeconds(mBootTimestamp))) + .append( + String.format( + "\n\tusage=%f|total=%f|consume=%f", + mPercentOfTotal, mTotalPower, mConsumePower)) + .append( + String.format( + "\n\tforeground=%f|foregroundService=%f", + mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower)) + .append( + String.format( + "\n\tbackground=%f|cached=%f", + mBackgroundUsageConsumePower, mCachedUsageConsumePower)) + .append( + String.format( + "\n\telapsedTime,fg=%d|fgs=%d|bg=%d", + TimestampUtils.getSeconds(mForegroundUsageTimeInMs), + TimestampUtils.getSeconds(mForegroundServiceUsageTimeInMs), + TimestampUtils.getSeconds(mBackgroundUsageTimeInMs))) + .append( + String.format( + "\n\tdrainType=%d|consumerType=%d", mDrainType, mConsumerType)) + .append( + String.format( + "\n\tbattery=%d|status=%d|health=%d\n}", + mBatteryLevel, mBatteryStatus, mBatteryHealth)) + .toString(); } private int getInteger(ContentValues values, String key) {