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

Commit 0658dcd6 authored May 25, 2017 by jackqdyulei Committed by android-build-merger May 25, 2017

Merge "Turn on power accounting in AOSP" into oc-dev am: 0a6d6188

am: db42779c

Change-Id: Ie4db806a166c45a14cd3b8ed69be6405befcb64b

parents b84b9cc8 db42779c

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -80,12 +80,12 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider

		@Override
		public boolean isAdvancedUiEnabled() {
		return false;
		return true;
		}

		@Override
		public boolean isPowerAccountingToggleEnabled() {
		return false;
		return true;
		}

		@Override

tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}