From 88c86f73bb27fa00041ca11e03aa2370d40c19d7 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Thu, 8 Feb 2018 10:12:34 -0800 Subject: [PATCH] Don't use debug data in app list controller This is a bug, USE_FAKE_DATA should never be true in build Change-Id: I14059cd243380c754ca0cff09f088d62828ec755 Fixes: 73117246 Test: Build --- .../fuelgauge/BatteryAppListPreferenceController.java | 3 ++- .../fuelgauge/BatteryAppListPreferenceControllerTest.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java index 2095f25e679..2f93d0a6ce0 100644 --- a/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java +++ b/src/com/android/settings/fuelgauge/BatteryAppListPreferenceController.java @@ -62,7 +62,8 @@ import java.util.List; */ public class BatteryAppListPreferenceController extends AbstractPreferenceController implements PreferenceControllerMixin, LifecycleObserver, OnPause, OnDestroy { - private static final boolean USE_FAKE_DATA = true; + @VisibleForTesting + static final boolean USE_FAKE_DATA = false; private static final int MAX_ITEMS_TO_LIST = USE_FAKE_DATA ? 30 : 10; private static final int MIN_AVERAGE_POWER_THRESHOLD_MILLI_AMP = 10; private static final int STATS_TYPE = BatteryStats.STATS_SINCE_CHARGED; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java index a814989a405..cee84dea3ee 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryAppListPreferenceControllerTest.java @@ -220,4 +220,9 @@ public class BatteryAppListPreferenceControllerTest { assertThat(mPreferenceController.isAvailable()).isFalse(); } + + @Test + public void testNeverUseFakeData() { + assertThat(BatteryAppListPreferenceController.USE_FAKE_DATA).isFalse(); + } }