Merge "Refine consumed battery value formula for power component" into sc-dev am: f49190d769 am: 1fea339388

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14702397

Change-Id: I9b2a16d20979d079f153c20730ba41bbc57b8822
This commit is contained in:
YUKAI HUNG
2021-05-26 07:43:18 +00:00
committed by Automerger Merge Worker

View File

@@ -241,7 +241,7 @@ public class BatteryEntry {
mBatteryConsumer = null;
mIsHidden = false;
mPowerComponentId = powerComponentId;
mConsumedPower = devicePowerMah - appsPowerMah;
mConsumedPower = devicePowerMah;
mUsageDurationMs = usageDurationMs;
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
@@ -265,11 +265,10 @@ public class BatteryEntry {
icon = context.getDrawable(iconId);
name = powerComponentName;
mConsumedPower = devicePowerMah - appsPowerMah;
mConsumedPower = devicePowerMah;
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
}
public Drawable getIcon() {
return icon;
}