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

Commit 7289b649 authored by Narayan Kamath's avatar Narayan Kamath Committed by Android (Google) Code Review
Browse files

Merge "Cherry pick parts of f5df700e6ce."

parents 9cddbd25 37764c71

services/inputflinger/EventHub.cpp

+1 −1
Original line number Diff line number Diff line
@@ -813,7 +813,7 @@ size_t EventHub::getEvents(int timeoutMillis, RawEvent* buffer, size_t bufferSiz 
                if (readSize == 0 || (readSize < 0 && errno == ENODEV)) {

                    // Device was removed before INotify noticed.

                    ALOGW("could not get event, removed? (fd: %d size: %d bufferSize: %d "

                            "capacity: %d errno: %d)\n",

                            "capacity: %zu errno: %d)\n",

                            device->fd, readSize, bufferSize, capacity, errno);

                    deviceChanged = true;

                    closeDeviceLocked(device);

services/inputflinger/InputDispatcher.cpp

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static bool validateMotionEvent(int32_t action, size_t pointerCount, 
        return false;

    }

    if (pointerCount < 1 || pointerCount > MAX_POINTERS) {

        ALOGE("Motion event has invalid pointer count %d; value must be between 1 and %d.",

        ALOGE("Motion event has invalid pointer count %zu; value must be between 1 and %d.",

                pointerCount, MAX_POINTERS);

        return false;

    }

services/inputflinger/InputReader.cpp

+3 −3
Original line number Diff line number Diff line
@@ -6174,8 +6174,8 @@ void MultiTouchInputMapper::configureRawPointerAxes() { 
            && mRawPointerAxes.slot.minValue == 0 && mRawPointerAxes.slot.maxValue > 0) {

        size_t slotCount = mRawPointerAxes.slot.maxValue + 1;

        if (slotCount > MAX_SLOTS) {

            ALOGW("MultiTouch Device %s reported %d slots but the framework "

                    "only supports a maximum of %d slots at this time.",

            ALOGW("MultiTouch Device %s reported %zu slots but the framework "

                    "only supports a maximum of %zu slots at this time.",

                    getDeviceName().string(), slotCount, MAX_SLOTS);

            slotCount = MAX_SLOTS;

        }
@@ -6347,7 +6347,7 @@ void JoystickInputMapper::configure(nsecs_t when, 
        // If there are too many axes, start dropping them.

        // Prefer to keep explicitly mapped axes.

        if (mAxes.size() > PointerCoords::MAX_AXES) {

            ALOGI("Joystick '%s' has %d axes but the framework only supports a maximum of %d.",

            ALOGI("Joystick '%s' has %zu axes but the framework only supports a maximum of %d.",

                    getDeviceName().string(), mAxes.size(), PointerCoords::MAX_AXES);

            pruneAxes(true);

            pruneAxes(false);