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

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

Merge "Disable anomaly app detection for battery" into rvc-dev

parents dd356c56 850bafbf

src/com/android/settings/fuelgauge/batterytip/BatteryTipLoader.java

+3 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import com.android.settings.fuelgauge.BatteryUtils; 
import com.android.settings.fuelgauge.batterytip.detectors.EarlyWarningDetector;

import com.android.settings.fuelgauge.batterytip.detectors.HighUsageDetector;

import com.android.settings.fuelgauge.batterytip.detectors.LowBatteryDetector;

import com.android.settings.fuelgauge.batterytip.detectors.RestrictAppDetector;

import com.android.settings.fuelgauge.batterytip.detectors.SmartBatteryDetector;

import com.android.settings.fuelgauge.batterytip.detectors.SummaryDetector;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
@@ -74,7 +73,9 @@ public class BatteryTipLoader extends AsyncLoaderCompat<List<BatteryTip>> { 
        tips.add(new SmartBatteryDetector(policy, context.getContentResolver()).detect());

        tips.add(new EarlyWarningDetector(policy, context).detect());

        tips.add(new SummaryDetector(policy, batteryInfo.averageTimeToDischarge).detect());

        tips.add(new RestrictAppDetector(context, policy).detect());

        // Disable this feature now since it introduces false positive cases. We will try to improve

        // it in the future.

        // tips.add(new RestrictAppDetector(context, policy).detect());



        Collections.sort(tips);

        return tips;

tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipLoaderTest.java

+1 −3
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.settings.fuelgauge.BatteryUtils; 
import com.android.settings.fuelgauge.batterytip.tips.AppLabelPredicate;

import com.android.settings.fuelgauge.batterytip.tips.AppRestrictionPredicate;

import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;

import com.android.settings.testutils.BatteryTestUtils;



import org.junit.After;

import org.junit.Before;
@@ -43,15 +42,14 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.util.ReflectionHelpers;



import java.util.List;

import org.robolectric.util.ReflectionHelpers;



@RunWith(RobolectricTestRunner.class)

public class BatteryTipLoaderTest {



    private static final int[] TIP_ORDER = {

            BatteryTip.TipType.APP_RESTRICTION,

            BatteryTip.TipType.BATTERY_SAVER,

            BatteryTip.TipType.HIGH_DEVICE_USAGE,

            BatteryTip.TipType.LOW_BATTERY,