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

Merge "Adjust consumed power for SystemBatteryConsumers" into sc-dev am: 6af63e3b07

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

Change-Id: Iee3a3ab280bc2aebd89c77880e18a05b0ed80b95
This commit is contained in:
Dmitri Plotnikov
2021-03-26 14:45:13 +00:00
committed by Automerger Merge Worker
parent f40049c873 6af63e3b07
commit 8747218c03
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fuelgauge/BatteryEntry.java
View File

@@ -155,9 +155,10 @@ public class BatteryEntry {
mBatteryConsumer = batteryConsumer; mBatteryConsumer = batteryConsumer;
mIsHidden = isHidden; mIsHidden = isHidden;
mDefaultPackageName = packageName; mDefaultPackageName = packageName;
mConsumedPower = batteryConsumer.getConsumedPower();
if (batteryConsumer instanceof UidBatteryConsumer) { if (batteryConsumer instanceof UidBatteryConsumer) {
mConsumedPower = batteryConsumer.getConsumedPower();
UidBatteryConsumer uidBatteryConsumer = (UidBatteryConsumer) batteryConsumer; UidBatteryConsumer uidBatteryConsumer = (UidBatteryConsumer) batteryConsumer;
int uid = uidBatteryConsumer.getUid(); int uid = uidBatteryConsumer.getUid();
if (mDefaultPackageName == null) { if (mDefaultPackageName == null) {
@@ -183,11 +184,15 @@ public class BatteryEntry {
getQuickNameIconForUid(uid, packages); getQuickNameIconForUid(uid, packages);
return; return;
} else if (batteryConsumer instanceof SystemBatteryConsumer) { } else if (batteryConsumer instanceof SystemBatteryConsumer) {
mConsumedPower = batteryConsumer.getConsumedPower()
- ((SystemBatteryConsumer) batteryConsumer).getPowerConsumedByApps();
final Pair<Integer, String> resourcePair = getResourcePairFromDrainType( final Pair<Integer, String> resourcePair = getResourcePairFromDrainType(
context, ((SystemBatteryConsumer) batteryConsumer).getDrainType()); context, ((SystemBatteryConsumer) batteryConsumer).getDrainType());
iconId = resourcePair.first; iconId = resourcePair.first;
name = resourcePair.second; name = resourcePair.second;
} else if (batteryConsumer instanceof UserBatteryConsumer) { } else if (batteryConsumer instanceof UserBatteryConsumer) {
mConsumedPower = batteryConsumer.getConsumedPower();
UserInfo info = um.getUserInfo(((UserBatteryConsumer) batteryConsumer).getUserId()); UserInfo info = um.getUserInfo(((UserBatteryConsumer) batteryConsumer).getUserId());
if (info != null) { if (info != null) {
icon = Utils.getUserIcon(context, um, info); icon = Utils.getUserIcon(context, um, info);