Merge "Fixes ScreenUndimDetectorTest" (3198236b) · Commits · e / os / android_frameworks_base

services/tests/mockingservicestests/src/com/android/server/power/ScreenUndimDetectorTest.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -109,8 +109,8 @@ public class ScreenUndimDetectorTest {
		public void recordScreenPolicy_disabledByFlag_noop() {
		DeviceConfig.setProperty(NAMESPACE_ATTENTION_MANAGER_SERVICE,
		KEY_KEEP_SCREEN_ON_ENABLED, Boolean.FALSE.toString(), false /makeDefault/);
		mScreenUndimDetector.readValuesFromDeviceConfig();

		setup();
		mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, POLICY_DIM);
		mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, POLICY_BRIGHT);

		@@ -120,7 +120,7 @@ public class ScreenUndimDetectorTest {
		@Test
		public void recordScreenPolicy_samePolicy_noop() {
		for (int policy : ALL_POLICIES) {
		setup();
		resetDetector();
		mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, policy);
		mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, policy);

		@@ -154,7 +154,7 @@ public class ScreenUndimDetectorTest {
		if (from == POLICY_DIM && to == POLICY_BRIGHT) {
		continue;
		}
		setup();
		resetDetector();
		mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, from);
		mScreenUndimDetector.recordScreenPolicy(DEFAULT_DISPLAY_GROUP, to);

		@@ -295,7 +295,8 @@ public class ScreenUndimDetectorTest {
		@Test
		public void recordScreenPolicy_dimToNonBright_resets() {
		for (int to : Arrays.asList(POLICY_OFF, POLICY_DOZE)) {
		setup();
		resetDetector();

		mScreenUndimDetector.mUndimCounter = 1;
		mScreenUndimDetector.mUndimCounterStartedMillis = 123;
		mScreenUndimDetector.mWakeLock.acquire();
		@@ -313,7 +314,8 @@ public class ScreenUndimDetectorTest {
		@Test
		public void recordScreenPolicy_brightToNonDim_resets() {
		for (int to : Arrays.asList(POLICY_OFF, POLICY_DOZE)) {
		setup();
		resetDetector();

		mScreenUndimDetector.mUndimCounter = 1;
		mScreenUndimDetector.mUndimCounterStartedMillis = 123;
		mScreenUndimDetector.mWakeLock.acquire();
		@@ -356,4 +358,9 @@ public class ScreenUndimDetectorTest {
		}
		}
		}

		private void resetDetector() {
		mScreenUndimDetector.reset();
		mScreenUndimDetector.mCurrentScreenPolicy = 0;
		}
		}