Consume full tap in EndToEndNativeInputTest

Currently, the injection inside the test is happening asynchronously.
Occasionally, it seems that an inconsistent event stream is being sent.
Without further debugging about how this is possible, a speculative fix
is being made here by consuming a complete motion sequence after a tap
is injected.

This way, we know that the test must wait for the UP event to be
received, thus hopefully preventing the next test from running and
starting the asynchronous injection.

To prevent misuse of 'consumeEvent' in the future, it is also being made
private in this CL. Unfortunately, a bunch of other fields should also
be private (but were not made so in the beginning, possibly a typo). As
a result, some of the fields are now relied upon. These are kept as is
to keep focus of this CL.

Bug: 361264974
Test: atest libgui_test
Flag: TEST_ONLY
Change-Id: I99bac4022bab2b3aa106e0838b227f24eb512ea1

Author: vishniakou

libs/gui/tests/EndToEndNativeInputTest.cpp

@@ -183,20 +183,6 @@ class InputSurface {
         return std::make_unique<InputSurface>(surfaceControl, width, height);
     }
 
-    InputEvent* consumeEvent(std::chrono::milliseconds timeout = 3000ms) {
-        mClientChannel->waitForMessage(timeout);
-
-        InputEvent* ev;
-        uint32_t seqId;
-        status_t consumed = mInputConsumer->consume(&mInputEventFactory, true, -1, &seqId, &ev);
-        if (consumed != OK) {
-            return nullptr;
-        }
-        status_t status = mInputConsumer->sendFinishedSignal(seqId, true);
-        EXPECT_EQ(OK, status) << "Could not send finished signal";
-        return ev;
-    }
-
     void assertFocusChange(bool hasFocus) {
         InputEvent* ev = consumeEvent();
         ASSERT_NE(ev, nullptr);
@@ -323,14 +309,30 @@ class InputSurface {
     }
 
 public:
+    // But should be private
+    WindowInfo mInputInfo;
     sp<SurfaceControl> mSurfaceControl;
+
+private:
     std::shared_ptr<InputChannel> mClientChannel;
     sp<IInputFlinger> mInputFlinger;
 
-    WindowInfo mInputInfo;
-
     PreallocatedInputEventFactory mInputEventFactory;
     InputConsumer* mInputConsumer;
+
+    InputEvent* consumeEvent(std::chrono::milliseconds timeout = 3000ms) {
+        mClientChannel->waitForMessage(timeout);
+
+        InputEvent* ev;
+        uint32_t seqId;
+        status_t consumed = mInputConsumer->consume(&mInputEventFactory, true, -1, &seqId, &ev);
+        if (consumed != OK) {
+            return nullptr;
+        }
+        status_t status = mInputConsumer->sendFinishedSignal(seqId, true);
+        EXPECT_EQ(OK, status) << "Could not send finished signal";
+        return ev;
+    }
 };
 
 class BlastInputSurface : public InputSurface {
@@ -458,7 +460,7 @@ TEST_F(InputSurfacesTest, can_receive_input) {
 
     injectTap(101, 101);
 
-    EXPECT_NE(surface->consumeEvent(), nullptr);
+    surface->expectTap(1, 1);
 }
 
 /**
@@ -612,7 +614,7 @@ TEST_F(InputSurfacesTest, touchable_region) {
 
     // A tap within the surface but outside the touchable region should not be sent to the surface.
     injectTap(20, 30);
-    EXPECT_EQ(surface->consumeEvent(/*timeout=*/200ms), nullptr);
+    surface->assertNoEvent();
 
     injectTap(31, 52);
     surface->expectTap(20, 30);