Merge "Don't fail the tests if per-freq cpu times are not available." (0efb119d) · Commits · e / os / android_frameworks_base

core/tests/coretests/src/com/android/internal/os/BstatsCpuTimesValidationTest.java

+9 −3

Original line number	Diff line number	Diff line
		@@ -104,7 +104,9 @@ public class BstatsCpuTimesValidationTest {

		@Test
		public void testCpuFreqTimes() throws Exception {
		assumeTrue(sCpuFreqTimesAvailable);
		if (!sCpuFreqTimesAvailable) {
		return;
		}

		batteryOnScreenOn();
		forceStop();
		@@ -126,7 +128,9 @@ public class BstatsCpuTimesValidationTest {

		@Test
		public void testCpuFreqTimes_screenOff() throws Exception {
		assumeTrue(sCpuFreqTimesAvailable);
		if (!sCpuFreqTimesAvailable) {
		return;
		}

		batteryOnScreenOff();
		forceStop();
		@@ -154,7 +158,9 @@ public class BstatsCpuTimesValidationTest {

		@Test
		public void testCpuFreqTimes_isolatedProcess() throws Exception {
		assumeTrue(sCpuFreqTimesAvailable);
		if (!sCpuFreqTimesAvailable) {
		return;
		}

		batteryOnScreenOn();
		forceStop();