Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Alert ProxCheck listeners directly when timing out." into rvc-d1-dev am: 350583bea0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12294057

Change-Id: I895eb94d2cc6d208d82ffa6b247dde325b9c5eeb
This commit is contained in:
Dave Mankoff
2020-08-04 01:07:52 +00:00
committed by Automerger Merge Worker
parent 88a08c8934 350583bea0
commit 3a82e7dbc0
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

6
packages/SystemUI/tests/src/com/android/systemui/util/sensors/ProximityCheckTest.java
View File

@@ -16,6 +16,7 @@
package com.android.systemui.util.sensors; package com.android.systemui.util.sensors;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@@ -80,6 +81,8 @@ public class ProximityCheckTest extends SysuiTestCase {
mFakeExecutor.runAllReady(); mFakeExecutor.runAllReady();
assertFalse(mFakeProximitySensor.isRegistered()); assertFalse(mFakeProximitySensor.isRegistered());
assertEquals(1, mTestableCallback.mNumCalls);
assertNull(mTestableCallback.mLastResult);
} }
@Test @Test
@@ -110,9 +113,12 @@ public class ProximityCheckTest extends SysuiTestCase {
private static class TestableCallback implements Consumer<Boolean> { private static class TestableCallback implements Consumer<Boolean> {
Boolean mLastResult; Boolean mLastResult;
int mNumCalls = 0;
@Override @Override
public void accept(Boolean result) { public void accept(Boolean result) {
mLastResult = result; mLastResult = result;
mNumCalls++;
} }
} }
} }