From 265fe257c26941b0b3f8d3deb7b68eccd55b2e8f Mon Sep 17 00:00:00 2001
From: Shun Lung Chen <shunlungchen@google.com>
Date: Thu, 14 Mar 2024 02:20:58 +0000
Subject: [PATCH] Update detectSettingsAnomaly API to detectPowerAnomaly(1/2)

Since the detectSettingsAnomaly method does not only detect settings but
also other power related anomalies. Change the method name to
detectPowerAnomaly to make it more reflects what it really does.

Bug: 320404576
Test: make SettingsGoogleRoboTests
Change-Id: I4b5bec3aba81cd0dc6fef2c976eae3d64da3ede5
---
 .../settings/fuelgauge/PowerUsageFeatureProvider.java       | 6 ++++--
 .../settings/fuelgauge/PowerUsageFeatureProviderImpl.java   | 4 +++-
 .../fuelgauge/batteryusage/BatteryUsageDataLoader.java      | 2 +-
 .../settings/fuelgauge/batteryusage/PowerUsageAdvanced.java | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index a04d8f8ad12..35a173b6142 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.fuelgauge;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -110,8 +111,9 @@ public interface PowerUsageFeatureProvider {
     /** Returns {@code true} if delay the hourly job when device is booting */
     boolean delayHourlyJobWhenBooting();
 
-    /** Returns {@link Bundle} for settings anomaly detection result */
-    PowerAnomalyEventList detectSettingsAnomaly(
+    /** Returns {@link Bundle} for power anomaly detection result */
+    @Nullable
+    PowerAnomalyEventList detectPowerAnomaly(
             Context context, double displayDrain, DetectRequestSourceType detectRequestSourceType);
 
     /** Gets an intent for one time bypass charge limited to resume charging. */
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 75ebabbd4ec..f0616ed7edc 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge;
 
 import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME;
 
+import android.annotation.Nullable;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -179,7 +180,8 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
     }
 
     @Override
-    public PowerAnomalyEventList detectSettingsAnomaly(
+    @Nullable
+    public PowerAnomalyEventList detectPowerAnomaly(
             Context context, double displayDrain, DetectRequestSourceType detectRequestSourceType) {
         return null;
     }
diff --git a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
index d1bf0d21c0d..5b1a6a72dde 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/BatteryUsageDataLoader.java
@@ -137,7 +137,7 @@ public final class BatteryUsageDataLoader {
                                                                             .isEmpty()))) {
                                 FeatureFactory.getFeatureFactory()
                                         .getPowerUsageFeatureProvider()
-                                        .detectSettingsAnomaly(
+                                        .detectPowerAnomaly(
                                                 context,
                                                 /* displayDrain= */ 0,
                                                 DetectRequestSourceType.TYPE_DATA_LOADER);
diff --git a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
index f5ed06ddcee..65d941df355 100644
--- a/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/batteryusage/PowerUsageAdvanced.java
@@ -262,7 +262,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
                     final PowerUsageFeatureProvider powerUsageFeatureProvider =
                             FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();
                     final PowerAnomalyEventList anomalyEventList =
-                            powerUsageFeatureProvider.detectSettingsAnomaly(
+                            powerUsageFeatureProvider.detectPowerAnomaly(
                                     getContext(),
                                     /* displayDrain= */ 0,
                                     DetectRequestSourceType.TYPE_USAGE_UI);