Merge "Update detectSettingsAnomaly API to detectPowerAnomaly(1/2)" into main

This commit is contained in:
YK Hung
2024-03-25 16:14:04 +00:00
committed by Android (Google) Code Review
4 changed files with 9 additions and 5 deletions

View File

@@ -16,6 +16,7 @@
package com.android.settings.fuelgauge; package com.android.settings.fuelgauge;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
@@ -110,8 +111,9 @@ public interface PowerUsageFeatureProvider {
/** Returns {@code true} if delay the hourly job when device is booting */ /** Returns {@code true} if delay the hourly job when device is booting */
boolean delayHourlyJobWhenBooting(); boolean delayHourlyJobWhenBooting();
/** Returns {@link Bundle} for settings anomaly detection result */ /** Returns {@link Bundle} for power anomaly detection result */
PowerAnomalyEventList detectSettingsAnomaly( @Nullable
PowerAnomalyEventList detectPowerAnomaly(
Context context, double displayDrain, DetectRequestSourceType detectRequestSourceType); Context context, double displayDrain, DetectRequestSourceType detectRequestSourceType);
/** Gets an intent for one time bypass charge limited to resume charging. */ /** Gets an intent for one time bypass charge limited to resume charging. */

View File

@@ -18,6 +18,7 @@ package com.android.settings.fuelgauge;
import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME; import static com.android.settings.Utils.SYSTEMUI_PACKAGE_NAME;
import android.annotation.Nullable;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -179,7 +180,8 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider
} }
@Override @Override
public PowerAnomalyEventList detectSettingsAnomaly( @Nullable
public PowerAnomalyEventList detectPowerAnomaly(
Context context, double displayDrain, DetectRequestSourceType detectRequestSourceType) { Context context, double displayDrain, DetectRequestSourceType detectRequestSourceType) {
return null; return null;
} }

View File

@@ -137,7 +137,7 @@ public final class BatteryUsageDataLoader {
.isEmpty()))) { .isEmpty()))) {
FeatureFactory.getFeatureFactory() FeatureFactory.getFeatureFactory()
.getPowerUsageFeatureProvider() .getPowerUsageFeatureProvider()
.detectSettingsAnomaly( .detectPowerAnomaly(
context, context,
/* displayDrain= */ 0, /* displayDrain= */ 0,
DetectRequestSourceType.TYPE_DATA_LOADER); DetectRequestSourceType.TYPE_DATA_LOADER);

View File

@@ -262,7 +262,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
final PowerUsageFeatureProvider powerUsageFeatureProvider = final PowerUsageFeatureProvider powerUsageFeatureProvider =
FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider(); FeatureFactory.getFeatureFactory().getPowerUsageFeatureProvider();
final PowerAnomalyEventList anomalyEventList = final PowerAnomalyEventList anomalyEventList =
powerUsageFeatureProvider.detectSettingsAnomaly( powerUsageFeatureProvider.detectPowerAnomaly(
getContext(), getContext(),
/* displayDrain= */ 0, /* displayDrain= */ 0,
DetectRequestSourceType.TYPE_USAGE_UI); DetectRequestSourceType.TYPE_USAGE_UI);