diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java index 98e1a6e8470..41ba519be6a 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java @@ -26,6 +26,7 @@ import android.util.SparseIntArray; import androidx.annotation.NonNull; import com.android.settings.fuelgauge.batteryusage.BatteryDiffData; +import com.android.settings.fuelgauge.batteryusage.BatteryEvent; import com.android.settings.fuelgauge.batteryusage.DetectRequestSourceType; import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList; import com.android.settingslib.fuelgauge.Estimate; @@ -166,5 +167,6 @@ public interface PowerUsageFeatureProvider { boolean processBatteryReattributeData( @NonNull Context context, @NonNull Map batteryDiffDataMap, + @NonNull List batteryEventList, final boolean isFromPeriodJob); } diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index dc5b2269cf8..65e8435a457 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -18,7 +18,6 @@ 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; @@ -28,9 +27,11 @@ import android.util.ArraySet; import android.util.SparseIntArray; import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.android.internal.util.ArrayUtils; import com.android.settings.fuelgauge.batteryusage.BatteryDiffData; +import com.android.settings.fuelgauge.batteryusage.BatteryEvent; import com.android.settings.fuelgauge.batteryusage.DetectRequestSourceType; import com.android.settings.fuelgauge.batteryusage.PowerAnomalyEventList; import com.android.settingslib.fuelgauge.Estimate; @@ -254,6 +255,7 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider public boolean processBatteryReattributeData( @NonNull Context context, @NonNull Map batteryDiffDataMap, + @NonNull List batteryEventList, final boolean isFromPeriodJob) { return false; } diff --git a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java index 2b88d34a17a..0a1a547ecc2 100644 --- a/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java +++ b/src/com/android/settings/fuelgauge/batteryusage/DataProcessManager.java @@ -522,7 +522,7 @@ public class DataProcessManager { FeatureFactory.getFeatureFactory() .getPowerUsageFeatureProvider(); featureProvider.processBatteryReattributeData( - mContext, batteryDiffDataMap, mIsFromPeriodJob); + mContext, batteryDiffDataMap, mBatteryEventList, mIsFromPeriodJob); Log.d( TAG,