Merge "Refine consumed battery value formula for power component" into sc-dev
This commit is contained in:
@@ -241,7 +241,7 @@ public class BatteryEntry {
|
|||||||
mBatteryConsumer = null;
|
mBatteryConsumer = null;
|
||||||
mIsHidden = false;
|
mIsHidden = false;
|
||||||
mPowerComponentId = powerComponentId;
|
mPowerComponentId = powerComponentId;
|
||||||
mConsumedPower = devicePowerMah - appsPowerMah;
|
mConsumedPower = devicePowerMah;
|
||||||
mUsageDurationMs = usageDurationMs;
|
mUsageDurationMs = usageDurationMs;
|
||||||
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
|
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
|
||||||
|
|
||||||
@@ -265,11 +265,10 @@ public class BatteryEntry {
|
|||||||
icon = context.getDrawable(iconId);
|
icon = context.getDrawable(iconId);
|
||||||
name = powerComponentName;
|
name = powerComponentName;
|
||||||
|
|
||||||
mConsumedPower = devicePowerMah - appsPowerMah;
|
mConsumedPower = devicePowerMah;
|
||||||
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
|
mConsumerType = ConvertUtils.CONSUMER_TYPE_SYSTEM_BATTERY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public Drawable getIcon() {
|
public Drawable getIcon() {
|
||||||
return icon;
|
return icon;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user