Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85cc4cd8 authored by YK Hung's avatar YK Hung Committed by Android (Google) Code Review
Browse files

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

parents 333b21c6 265fe257

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

+4 −2
Original line number Diff line number Diff line
@@ -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. */

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ public final class BatteryUsageDataLoader { 
                                                                            .isEmpty()))) {

                                FeatureFactory.getFeatureFactory()

                                        .getPowerUsageFeatureProvider()

                                        .detectSettingsAnomaly(

                                        .detectPowerAnomaly(

                                                context,

                                                /* displayDrain= */ 0,

                                                DetectRequestSourceType.TYPE_DATA_LOADER);

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

+1 −1
Original line number Diff line number Diff line
@@ -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);