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

Commit 7c7e2357 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update battery usage app list filter logic:"

parents b6aae6cc 7fad47a8

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

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,11 @@ public interface PowerUsageFeatureProvider { 
     */

    boolean isBatteryUsageEnabled();



    /**

     * Returns a threshold (in milliseconds) for the minimal screen on time in battery usage list

     */

    double getBatteryUsageListScreenOnTimeThresholdInMs();



    /**

     * Returns a threshold (mA) for the minimal comsume power in battery usage list

     */

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

+6 −1
Original line number Diff line number Diff line
@@ -71,9 +71,14 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider 
        return true;

    }



    @Override

    public double getBatteryUsageListScreenOnTimeThresholdInMs() {

        return 0;

    }



    @Override

    public double getBatteryUsageListConsumePowerThreshold() {

        return 0.0;

        return 0;

    }



    @Override

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

+5 −1
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ public class BatteryDiffData { 
    private static void purgeBatteryDiffData(

            final PowerUsageFeatureProvider featureProvider,

            final List<BatteryDiffEntry> entries) {

        final double screenOnTimeThresholdInMs =

                featureProvider.getBatteryUsageListScreenOnTimeThresholdInMs();

        final double consumePowerThreshold =

                featureProvider.getBatteryUsageListConsumePowerThreshold();

        final Set<Integer> hideSystemComponentSet = featureProvider.getHideSystemComponentSet();
@@ -100,10 +102,12 @@ public class BatteryDiffData { 
        final Iterator<BatteryDiffEntry> iterator = entries.iterator();

        while (iterator.hasNext()) {

            final BatteryDiffEntry entry = iterator.next();

            final long screenOnTimeInMs = entry.mScreenOnTimeInMs;

            final double comsumePower = entry.mConsumePower;

            final String packageName = entry.getPackageName();

            final Integer componentId = entry.mBatteryHistEntry.mDrainType;

            if (comsumePower < consumePowerThreshold

            if ((screenOnTimeInMs < screenOnTimeThresholdInMs

                    && comsumePower < consumePowerThreshold)

                    || ConvertUtils.FAKE_PACKAGE_NAME.equals(packageName)

                    || hideSystemComponentSet.contains(componentId)

                    || (packageName != null && hideApplicationSet.contains(packageName))) {