From 4c29aad5f1815eb0427dec71f242a85be41f16a7 Mon Sep 17 00:00:00 2001
From: ykhung <ykhung@google.com>
Date: Tue, 25 May 2021 12:01:06 +0800
Subject: [PATCH] Refine consumed battery value formula for power component

for power component, the battery UI is designed to show system relative component without considering the attributed apps, update the current formula to use `devicePowerMah` value data only

Bug: 188663505
Test: make SettingsgRoboTests
Change-Id: Ibeeb360915303faed2f79c4621f17d6ba0dd725f
---
 src/com/android/settings/fuelgauge/BatteryEntry.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/BatteryEntry.java b/src/com/android/settings/fuelgauge/BatteryEntry.java
index 25a66b6c34d..636d2651a8d 100644
--- a/src/com/android/settings/fuelgauge/BatteryEntry.java
+++ b/src/com/android/settings/fuelgauge/BatteryEntry.java
@@ -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;
     }