Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev (350583be) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/util/sensors/ProximitySensor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -338,7 +338,7 @@ public class ProximitySensor implements ThresholdSensor {
		@Override
		public void run() {
		unregister();
		mSensor.alertListeners();
		onProximityEvent(null);
		}

		/**

+6 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.util.sensors;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertFalse;
		import static org.junit.Assert.assertNull;
		import static org.junit.Assert.assertTrue;
		@@ -80,6 +81,8 @@ public class ProximityCheckTest extends SysuiTestCase {
		mFakeExecutor.runAllReady();

		assertFalse(mFakeProximitySensor.isRegistered());
		assertEquals(1, mTestableCallback.mNumCalls);
		assertNull(mTestableCallback.mLastResult);
		}

		@Test
		@@ -110,9 +113,12 @@ public class ProximityCheckTest extends SysuiTestCase {

		private static class TestableCallback implements Consumer<Boolean> {
		Boolean mLastResult;
		int mNumCalls = 0;

		@Override
		public void accept(Boolean result) {
		mLastResult = result;
		mNumCalls++;
		}
		}
		}