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

Merge "Prevent paused ThresholdSensorImpl event delivery." into rvc-d1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2020-04-28 21:38:48 +00:00
committed by Android (Google) Code Review
parent a3fa90982f 8c5cce6328
commit d688f8ba58
2 changed files with 18 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/ThresholdSensorImpl.java
View File

@@ -167,7 +167,7 @@ class ThresholdSensorImpl implements ThresholdSensor {
private void onSensorEvent(boolean below, long timestampNs) { private void onSensorEvent(boolean below, long timestampNs) {
Assert.isMainThread(); Assert.isMainThread();
if (mLastBelow != null && mLastBelow == below) { if (!mRegistered || mLastBelow != null && mLastBelow == below) {
return; return;
} }
mLastBelow = below; mLastBelow = below;

17
packages/SystemUI/tests/src/com/android/systemui/util/sensors/ThresholdSensorImplTest.java
View File

@@ -226,6 +226,23 @@ public class ThresholdSensorImplTest extends SysuiTestCase {
waitForSensorManager(); waitForSensorManager();
} }
@Test
public void testAlertAfterPause() {
TestableListener listener = new TestableListener();
mThresholdSensor.register(listener);
waitForSensorManager();
mFakeProximitySensor.sendProximityResult(false);
assertTrue(listener.mBelow);
assertEquals(1, listener.mCallCount);
mThresholdSensor.pause();
mFakeProximitySensor.sendProximityResult(false);
assertTrue(listener.mBelow);
assertEquals(1, listener.mCallCount);
}
static class TestableListener implements ThresholdSensor.Listener { static class TestableListener implements ThresholdSensor.Listener {
boolean mBelow; boolean mBelow;
long mTimestampNs; long mTimestampNs;