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

Commit 3a82e7db authored by Dave Mankoff's avatar Dave Mankoff Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I895eb94d2cc6d208d82ffa6b247dde325b9c5eeb
parents 88a08c89 350583be

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

        }

    }

}