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

Commit 17975e94 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Increase timeouts in InputDispatcher_tests" into main

parents ee140b10 b237f9e2

include/input/Input.h

+6 −6
Original line number Diff line number Diff line
@@ -551,7 +551,7 @@ class KeyEvent : public InputEvent { 
public:

    virtual ~KeyEvent() { }



    virtual InputEventType getType() const { return InputEventType::KEY; }

    InputEventType getType() const override { return InputEventType::KEY; }



    inline int32_t getAction() const { return mAction; }
@@ -602,7 +602,7 @@ class MotionEvent : public InputEvent { 
public:

    virtual ~MotionEvent() { }



    virtual InputEventType getType() const { return InputEventType::MOTION; }

    InputEventType getType() const override { return InputEventType::MOTION; }



    inline int32_t getAction() const { return mAction; }
@@ -930,7 +930,7 @@ class FocusEvent : public InputEvent { 
public:

    virtual ~FocusEvent() {}



    virtual InputEventType getType() const override { return InputEventType::FOCUS; }

    InputEventType getType() const override { return InputEventType::FOCUS; }



    inline bool getHasFocus() const { return mHasFocus; }
@@ -949,7 +949,7 @@ class CaptureEvent : public InputEvent { 
public:

    virtual ~CaptureEvent() {}



    virtual InputEventType getType() const override { return InputEventType::CAPTURE; }

    InputEventType getType() const override { return InputEventType::CAPTURE; }



    inline bool getPointerCaptureEnabled() const { return mPointerCaptureEnabled; }
@@ -968,7 +968,7 @@ class DragEvent : public InputEvent { 
public:

    virtual ~DragEvent() {}



    virtual InputEventType getType() const override { return InputEventType::DRAG; }

    InputEventType getType() const override { return InputEventType::DRAG; }



    inline bool isExiting() const { return mIsExiting; }
@@ -992,7 +992,7 @@ class TouchModeEvent : public InputEvent { 
public:

    virtual ~TouchModeEvent() {}



    virtual InputEventType getType() const override { return InputEventType::TOUCH_MODE; }

    InputEventType getType() const override { return InputEventType::TOUCH_MODE; }



    inline bool isInTouchMode() const { return mIsInTouchMode; }

services/inputflinger/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ cc_test { 
        "SlopController_test.cpp",

        "SyncQueue_test.cpp",

        "TestInputListener.cpp",

        "TestInputListenerMatchers.cpp",

        "TouchpadInputMapper_test.cpp",

        "KeyboardInputMapper_test.cpp",

        "UinputDevice.cpp",