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

Commit a27adc82 authored by Ryan Prichard's avatar Ryan Prichard Committed by Automerger Merge Worker
Browse files

Merge "inputflinger: avoid vector<const T>" into main am: 5dd9afa2 am: 0f0123f8 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3264432



Change-Id: I0037fd4cb66e1c2d4fe467ecb3e9e68f6f8c7d17
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b0bdd2c 0f0123f8

services/inputflinger/tests/InputTracingTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -133,8 +133,8 @@ protected: 
        mDispatcher->setFocusedWindow(request);

    }



    void tapAndExpect(const std::vector<const sp<FakeWindowHandle>>& windows,

                      Level inboundTraceLevel, Level dispatchTraceLevel, InputTraceSession& s) {

    void tapAndExpect(const std::vector<sp<FakeWindowHandle>>& windows, Level inboundTraceLevel,

                      Level dispatchTraceLevel, InputTraceSession& s) {

        const auto down = MotionArgsBuilder(ACTION_DOWN, AINPUT_SOURCE_TOUCHSCREEN)

                                  .pointer(PointerBuilder(0, ToolType::FINGER).x(100).y(110))

                                  .build();
@@ -156,7 +156,7 @@ protected: 
        }

    }



    void keypressAndExpect(const std::vector<const sp<FakeWindowHandle>>& windows,

    void keypressAndExpect(const std::vector<sp<FakeWindowHandle>>& windows,

                           Level inboundTraceLevel, Level dispatchTraceLevel,

                           InputTraceSession& s) {

        const auto down = KeyArgsBuilder(ACTION_DOWN, AINPUT_SOURCE_KEYBOARD).build();