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

Commit db42779c 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

Change-Id: I9204d0b51db9fedbf2f49b5d635e46b221c5d7ea

parents 4472d8af 0a6d6188

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -77,11 +77,11 @@ public class PowerUsageFeatureProviderImpl implements PowerUsageFeatureProvider

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

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

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

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -125,4 +125,14 @@ public class PowerUsageFeatureProviderImplTest {

	assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();		assertThat(mPowerFeatureProvider.isTypeSystem(mBatterySipper)).isFalse();
	}		}

			@Test
			public void testIsAdvancedUiEnabled_returnTrue() {
			assertThat(mPowerFeatureProvider.isAdvancedUiEnabled()).isTrue();
			}

			@Test
			public void testIsPowerAccountingToggleEnabled_returnTrue() {
			assertThat(mPowerFeatureProvider.isPowerAccountingToggleEnabled()).isTrue();
			}
	}		}