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

Commit 2166c23c authored by LuK1337's avatar LuK1337
Browse files

MotionEvent: Add backwards compatible initialize() function 

After 0957669e changed MotionEvent::initialize() function signature,
libwfdnative.so compiled for Android 12 fails to load.

Change-Id: I8ad721adc0f00610836df62826d74d7da6764a39
parent 30cf9015

include/input/Input.h

+11 −0
Original line number Diff line number Diff line
@@ -759,6 +759,17 @@ public: 
                    int32_t displayHeight, nsecs_t downTime, nsecs_t eventTime, size_t pointerCount,

                    const PointerProperties* pointerProperties, const PointerCoords* pointerCoords);



private:

    void initialize(int32_t id, int32_t deviceId, uint32_t source, int32_t displayId,

                    std::array<uint8_t, 32> hmac, int32_t action, int32_t actionButton,

                    int32_t flags, int32_t edgeFlags, int32_t metaState, int32_t buttonState,

                    MotionClassification classification, const ui::Transform& transform,

                    float xPrecision, float yPrecision, float rawXCursorPosition,

                    float rawYCursorPosition, int32_t displayWidth, int32_t displayHeight,

                    nsecs_t downTime, nsecs_t eventTime, size_t pointerCount,

                    const PointerProperties* pointerProperties, const PointerCoords* pointerCoords);



public:

    void copyFrom(const MotionEvent* other, bool keepHistory);



    void addSample(

libs/input/Input.cpp

+18 −0
Original line number Diff line number Diff line
@@ -455,6 +455,24 @@ void MotionEvent::initialize(int32_t id, int32_t deviceId, uint32_t source, int3 
    addSample(eventTime, pointerCoords);

}



void MotionEvent::initialize(int32_t id, int32_t deviceId, uint32_t source, int32_t displayId,

                             std::array<uint8_t, 32> hmac, int32_t action, int32_t actionButton,

                             int32_t flags, int32_t edgeFlags, int32_t metaState,

                             int32_t buttonState, MotionClassification classification,

                             const ui::Transform& transform, float xPrecision, float yPrecision,

                             float rawXCursorPosition, float rawYCursorPosition,

                             int32_t displayWidth, int32_t displayHeight, nsecs_t downTime,

                             nsecs_t eventTime, size_t pointerCount,

                             const PointerProperties* pointerProperties,

                             const PointerCoords* pointerCoords) {

    uint32_t displayOrientation = ui::Transform::ROT_0;

    MotionEvent::initialize(id, deviceId, source, displayId, hmac, action, actionButton, flags,

                            edgeFlags, metaState, buttonState, classification, transform,

                            xPrecision, yPrecision, rawXCursorPosition, rawYCursorPosition,

                            displayOrientation, displayWidth, displayHeight, downTime, eventTime,

                            pointerCount, pointerProperties, pointerCoords);

}



void MotionEvent::copyFrom(const MotionEvent* other, bool keepHistory) {

    InputEvent::initialize(other->mId, other->mDeviceId, other->mSource, other->mDisplayId,

                           other->mHmac);