From 1d51b3cc15125354d0ba803f21506b7f3f2c7c42 Mon Sep 17 00:00:00 2001 From: jackqdyulei Date: Tue, 23 May 2017 15:35:54 -0700 Subject: [PATCH] Turn on power accounting in AOSP Bug: 38328724 Test: RunSettingsRoboTests Change-Id: Ibb2691ffdf8581549a1e99f94a8dbaa849453742 --- .../fuelgauge/PowerUsageFeatureProviderImpl.java | 4 ++-- .../fuelgauge/PowerUsageFeatureProviderImplTest.java | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java index 10ffc4977d3..be38855e024 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java +++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java @@ -77,11 +77,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider @Override public boolean isAdvancedUiEnabled() { - return false; + return true; } @Override public boolean isPowerAccountingToggleEnabled() { - return false; + return true; } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java index f32ea7a5340..8e9febe3eab 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java @@ -125,4 +125,14 @@ public class PowerUsageFeatureProviderImplTest { assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse(); } + + @Test + public void testIsAdvancedUiEnabled_returnTrue() { + assertThat(mPowerFeatureProvider.isAdvancedUiEnabled()).isTrue(); + } + + @Test + public void testIsPowerAccountingToggleEnabled_returnTrue() { + assertThat(mPowerFeatureProvider.isPowerAccountingToggleEnabled()).isTrue(); + } }