Merge "Disable anomaly app detection for battery" into rvc-dev am: 90331c0f20 am: ef95b4781b am: 424c5ad859 am: 51b53dd01f

Change-Id: If786ba1387136708d83bc649cbbaf3a50cc08039
This commit is contained in:
TreeHugger Robot
2020-05-29 07:37:53 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 5 deletions

View File

@@ -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,