Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59

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

Change-Id: I9f64cc6e3a11f76ee920b557ad5ec6d77dc5f73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java

@@ -152,6 +152,11 @@ public interface PowerUsageFeatureProvider {
      */
     Set<Integer> getOthersSystemComponentSet();
 
+    /**
+     * Returns {@link Set} for the custom system component names which are combined into others
+     */
+    Set<String> getOthersCustomComponentNameSet();
+
     /**
      * Returns {@link Set} for hiding system component ids in the usage screen
      */

src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java

@@ -172,6 +172,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
         return new ArraySet<>();
     }
 
+    @Override
+    public Set<String> getOthersCustomComponentNameSet() {
+        return new ArraySet<>();
+    }
+
     @Override
     public Set<Integer> getHideSystemComponentSet() {
         return new ArraySet<>();

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

@@ -17,6 +17,7 @@
 package com.android.settings.fuelgauge.batteryusage;
 
 import android.content.Context;
+import android.os.BatteryConsumer;
 
 import androidx.annotation.NonNull;
 
@@ -151,11 +152,17 @@ public class BatteryDiffData {
             final PowerUsageFeatureProvider featureProvider,
             final List<BatteryDiffEntry> systemEntries) {
         final Set<Integer> othersSystemComponentSet = featureProvider.getOthersSystemComponentSet();
+        final Set<String> othersCustomComponentNameSet =
+                featureProvider.getOthersCustomComponentNameSet();
         BatteryDiffEntry.OthersBatteryDiffEntry othersDiffEntry = null;
         final Iterator<BatteryDiffEntry> systemListIterator = systemEntries.iterator();
         while (systemListIterator.hasNext()) {
             final BatteryDiffEntry batteryDiffEntry = systemListIterator.next();
-            if (othersSystemComponentSet.contains(batteryDiffEntry.mBatteryHistEntry.mDrainType)) {
+            final int componentId = batteryDiffEntry.mBatteryHistEntry.mDrainType;
+            if (othersSystemComponentSet.contains(componentId) || (
+                    componentId >= BatteryConsumer.FIRST_CUSTOM_POWER_COMPONENT_ID
+                            && othersCustomComponentNameSet.contains(
+                                    batteryDiffEntry.getAppLabel()))) {
                 if (othersDiffEntry == null) {
                     othersDiffEntry = new BatteryDiffEntry.OthersBatteryDiffEntry(context);
                 }