Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 06d38cab authored by Dave Mankoff's avatar Dave Mankoff
Browse files

Alert ProxCheck listeners directly when timing out. 

Before this change, we were relying on the ProximitySensor class
to circle back and tell the ProximityCheck class about null results.
When the ProximitySensor class changed, this broke ProxCheck. The
ProxCheck class now directly alerts its listeners when it times out.

A test has been added to cover this case now.

Fixes: 162205584
Test: atest SystemUiTests && Manual
Change-Id: Ie48589a54daae3e29defde9ed2300f3c7e2b88ae
parent afab5784

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);

        }



        /**

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

+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++;

        }

    }

}