commit 60f98c97e02a9d074500b4780caed709252c1060
author Wesley Wang <wesleycwwang@google.com> Fri Aug 11 07:35:52 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 11 07:35:52 2023 +0000
tree 9f77c6e16720d7f2495f57659061cbfc4c6f582c
parent aa78764e748efaabd03ab881fe4cbb40554471ee
parent 2545c9b3aea2d74ad2ea4b8ce094de8fef36e49e

Update detectSettingsAnomaly() return type (1/2) am: a277f78789 am: 2545c9b3ae

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

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

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

diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index 258ded1..30eabfa 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -22,6 +22,7 @@
 import android.util.ArrayMap;
 import android.util.SparseIntArray;
 
+import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
 import com.android.settingslib.fuelgauge.Estimate;
 
 import java.util.List;
@@ -147,7 +148,7 @@
     /**
      * Returns {@link Bundle} for settings anomaly detection result
      */
-    Bundle detectSettingsAnomaly(Context context, double displayDrain);
+    PowerAnomalyEventList detectSettingsAnomaly(Context context, double displayDrain);
 
     /**
      * Gets an intent for one time bypass charge limited to resume charging.

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

diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index ed97518..127178a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -21,13 +21,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.os.Bundle;
 import android.os.Process;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.SparseIntArray;
 
 import com.android.internal.util.ArrayUtils;
+import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList;
 import com.android.settingslib.fuelgauge.Estimate;
 
 import java.util.ArrayList;
@@ -175,7 +175,7 @@
     public void insertSettingsData(Context context, double displayDrain) {}
 
     @Override
-    public Bundle detectSettingsAnomaly(Context context, double displayDrain) {
+    public PowerAnomalyEventList detectSettingsAnomaly(Context context, double displayDrain) {
         return null;
     }