Merge "Update logs of BatteryEntry & BatteryHistEntry" into main (6d02ca94) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/batteryusage/BatteryEntry.java

+43 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}

src/com/android/settings/fuelgauge/batteryusage/BatteryHistEntry.java

+38 −35

Original line number	Diff line number	Diff line
		@@ -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(
		return new StringBuilder()
		.append("\nBatteryHistEntry{")
		.append(
		String.format(
		"\n\tpackage=%s\|label=%s\|uid=%d\|userId=%d\|isHidden=%b",
		mPackageName, mAppLabel, mUid, mUserId, mIsHidden));
		builder.append(
		mPackageName, mAppLabel, mUid, mUserId, mIsHidden))
		.append(
		String.format(
		"\n\ttimestamp=%s\|zoneId=%s\|bootTimestamp=%d",
		recordAtDateTime, mZoneId, TimestampUtils.getSeconds(mBootTimestamp)));
		builder.append(
		recordAtDateTime,
		mZoneId,
		TimestampUtils.getSeconds(mBootTimestamp)))
		.append(
		String.format(
		"\n\tusage=%f\|total=%f\|consume=%f",
		mPercentOfTotal, mTotalPower, mConsumePower));
		builder.append(
		mPercentOfTotal, mTotalPower, mConsumePower))
		.append(
		String.format(
		"\n\tforeground=%f\|foregroundService=%f",
		mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower));
		builder.append(
		mForegroundUsageConsumePower, mForegroundServiceUsageConsumePower))
		.append(
		String.format(
		"\n\tbackground=%f\|cached=%f",
		mBackgroundUsageConsumePower, mCachedUsageConsumePower));
		builder.append(
		mBackgroundUsageConsumePower, mCachedUsageConsumePower))
		.append(
		String.format(
		"\n\telapsedTime,fg=%d\|fgs=%d\|bg=%d",
		TimestampUtils.getSeconds(mBackgroundUsageTimeInMs),
		TimestampUtils.getSeconds(mForegroundUsageTimeInMs),
		TimestampUtils.getSeconds(mForegroundServiceUsageTimeInMs),
		TimestampUtils.getSeconds(mBackgroundUsageTimeInMs)));
		builder.append(
		String.format("\n\tdrainType=%d\|consumerType=%d", mDrainType, mConsumerType));
		builder.append(
		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));
		return builder.toString();
		mBatteryLevel, mBatteryStatus, mBatteryHealth))
		.toString();
		}

		private int getInteger(ContentValues values, String key) {