PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update logs of BatteryEntry & BatteryHistEntry

Browse Source 
Bug: 331426391
Test: manual
Change-Id: I2825cecbaab35b3ef4a645a9e2d57f579d88ef19
This commit is contained in:
mxyyiyi
2024-03-29 14:49:20 +08:00
parent 4e56242991
commit 7cea50775d
2 changed files with 81 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java
View File

@@ -40,6 +40,7 @@ import android.util.Log;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.fuelgauge.BatteryUtils;
import com.android.settingslib.Utils; import com.android.settingslib.Utils;
import com.android.settingslib.utils.StringUtil;
import java.util.Comparator; import java.util.Comparator;
import java.util.Locale; import java.util.Locale;
@@ -655,4 +656,46 @@ public class BatteryEntry {
return 0.0d; 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();
}
} }

43
src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java
View File

@@ -192,41 +192,44 @@ public class BatteryHistEntry {
@Override @Override
public String toString() { public String toString() {
final String recordAtDateTime = ConvertUtils.utcToLocalTimeForLogging(mTimestamp); final String recordAtDateTime = ConvertUtils.utcToLocalTimeForLogging(mTimestamp);
final StringBuilder builder = new StringBuilder(); return new StringBuilder()
builder.append("\nBatteryHistEntry{"); .append("\nBatteryHistEntry{")
builder.append( .append(
String.format( String.format(
"\n\tpackage=%s|label=%s|uid=%d|userId=%d|isHidden=%b", "\n\tpackage=%s|label=%s|uid=%d|userId=%d|isHidden=%b",
mPackageName, mAppLabel, mUid, mUserId, mIsHidden)); mPackageName, mAppLabel, mUid, mUserId, mIsHidden))
builder.append( .append(
String.format( String.format(
"\n\ttimestamp=%s|zoneId=%s|bootTimestamp=%d", "\n\ttimestamp=%s|zoneId=%s|bootTimestamp=%d",
recordAtDateTime, mZoneId, TimestampUtils.getSeconds(mBootTimestamp))); recordAtDateTime,
builder.append( mZoneId,
TimestampUtils.getSeconds(mBootTimestamp)))
.append(
String.format( String.format(
"\n\tusage=%f|total=%f|consume=%f", "\n\tusage=%f|total=%f|consume=%f",
mPercentOfTotal, mTotalPower, mConsumePower)); mPercentOfTotal, mTotalPower, mConsumePower))
builder.append( .append(
String.format( String.format(
"\n\tforeground=%f|foregroundService=%f", "\n\tforeground=%f|foregroundService=%f",
mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower)); mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower))
builder.append( .append(
String.format( String.format(
"\n\tbackground=%f|cached=%f", "\n\tbackground=%f|cached=%f",
mBackgroundUsageConsumePower, mCachedUsageConsumePower)); mBackgroundUsageConsumePower, mCachedUsageConsumePower))
builder.append( .append(
String.format( String.format(
"\n\telapsedTime,fg=%d|fgs=%d|bg=%d", "\n\telapsedTime,fg=%d|fgs=%d|bg=%d",
TimestampUtils.getSeconds(mBackgroundUsageTimeInMs), TimestampUtils.getSeconds(mForegroundUsageTimeInMs),
TimestampUtils.getSeconds(mForegroundServiceUsageTimeInMs), TimestampUtils.getSeconds(mForegroundServiceUsageTimeInMs),
TimestampUtils.getSeconds(mBackgroundUsageTimeInMs))); TimestampUtils.getSeconds(mBackgroundUsageTimeInMs)))
builder.append( .append(
String.format("\n\tdrainType=%d|consumerType=%d", mDrainType, mConsumerType)); String.format(
builder.append( "\n\tdrainType=%d|consumerType=%d", mDrainType, mConsumerType))
.append(
String.format( String.format(
"\n\tbattery=%d|status=%d|health=%d\n}", "\n\tbattery=%d|status=%d|health=%d\n}",
mBatteryLevel, mBatteryStatus, mBatteryHealth)); mBatteryLevel, mBatteryStatus, mBatteryHealth))
return builder.toString(); .toString();
} }
private int getInteger(ContentValues values, String key) { private int getInteger(ContentValues values, String key) {