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

Commit ec06a20d authored by Bryce Lee's avatar Bryce Lee Committed by Automerger Merge Worker
Browse files

Merge "Ensure TouchSessions are always removed." into tm-qpr-dev am: 5a384f0e am: ccd60177 

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



Change-Id: I4075db462e93feba946ef319198ff999e0e0c44f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7535df42 ccd60177

packages/SystemUI/src/com/android/systemui/dreams/touch/DreamOverlayTouchMonitor.java

+9 −0
Original line number Diff line number Diff line
@@ -226,6 +226,15 @@ public class DreamOverlayTouchMonitor { 
            return;

        }



        // When we stop monitoring touches, we must ensure that all active touch sessions and

        // descendants informed of the removal so any cleanup for active tracking can proceed.

        mExecutor.execute(() -> mActiveTouchSessions.forEach(touchSession -> {

            while (touchSession != null) {

                touchSession.onRemoved();

                touchSession = touchSession.getPredecessor();

            }

        }));



        mCurrentInputSession.dispose();

        mCurrentInputSession = null;

    }

packages/SystemUI/tests/src/com/android/systemui/dreams/touch/DreamOverlayTouchMonitorTest.java

+26 −0
Original line number Diff line number Diff line
@@ -424,6 +424,32 @@ public class DreamOverlayTouchMonitorTest extends SysuiTestCase { 
        verify(gestureListener2).onDown(eq(followupEvent));

    }



    @Test

    public void testOnRemovedCallbackOnStopMonitoring() {

        final DreamTouchHandler touchHandler = Mockito.mock(DreamTouchHandler.class);

        final DreamTouchHandler.TouchSession.Callback callback =

                Mockito.mock(DreamTouchHandler.TouchSession.Callback.class);



        final Environment environment = new Environment(Stream.of(touchHandler)

                .collect(Collectors.toCollection(HashSet::new)));



        final InputEvent initialEvent = Mockito.mock(InputEvent.class);

        environment.publishInputEvent(initialEvent);



        final DreamTouchHandler.TouchSession session = captureSession(touchHandler);

        session.registerCallback(callback);



        environment.executeAll();



        environment.updateLifecycle(observerOwnerPair -> {

            observerOwnerPair.first.onPause(observerOwnerPair.second);

        });



        environment.executeAll();



        verify(callback).onRemoved();

    }



    public GestureDetector.OnGestureListener registerGestureListener(DreamTouchHandler handler) {

        final GestureDetector.OnGestureListener gestureListener = Mockito.mock(

                GestureDetector.OnGestureListener.class);