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

Commit 5d83f60f authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Enforce print format warnings in input subsystem. 

Treat compiler warnings as errors. Switch to portable
print formatting of such types as uint64_t and size_t.

Bug: 64258224
Bug: 63412298
Test: m -j, interact with the phone using touch input,
check the logcat output.

Change-Id: I70a170b0b7d4ac979d997324741d0aeb2e2c458e
parent 0eebf526

libs/input/InputTransport.cpp

+3 −3
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ status_t InputPublisher::publishKeyEvent( 
#if DEBUG_TRANSPORT_ACTIONS

    ALOGD("channel '%s' publisher ~ publishKeyEvent: seq=%u, deviceId=%d, source=0x%x, "

            "action=0x%x, flags=0x%x, keyCode=%d, scanCode=%d, metaState=0x%x, repeatCount=%d,"

            "downTime=%lld, eventTime=%lld",

            "downTime=%" PRId64 ", eventTime=%" PRId64,

            mChannel->getName().string(), seq,

            deviceId, source, action, flags, keyCode, scanCode, metaState, repeatCount,

            downTime, eventTime);
@@ -305,7 +305,7 @@ status_t InputPublisher::publishMotionEvent( 
    ALOGD("channel '%s' publisher ~ publishMotionEvent: seq=%u, deviceId=%d, source=0x%x, "

            "action=0x%x, actionButton=0x%08x, flags=0x%x, edgeFlags=0x%x, "

            "metaState=0x%x, buttonState=0x%x, xOffset=%f, yOffset=%f, "

            "xPrecision=%f, yPrecision=%f, downTime=%lld, eventTime=%lld, "

            "xPrecision=%f, yPrecision=%f, downTime=%" PRId64 ", eventTime=%" PRId64 ", "

            "pointerCount=%" PRIu32,

            mChannel->getName().string(), seq,

            deviceId, source, action, actionButton, flags, edgeFlags, metaState, buttonState,
@@ -401,7 +401,7 @@ status_t InputConsumer::consume(InputEventFactoryInterface* factory, 
        bool consumeBatches, nsecs_t frameTime, uint32_t* outSeq, InputEvent** outEvent,

        int32_t* displayId) {

#if DEBUG_TRANSPORT_ACTIONS

    ALOGD("channel '%s' consumer ~ consume: consumeBatches=%s, frameTime=%lld",

    ALOGD("channel '%s' consumer ~ consume: consumeBatches=%s, frameTime=%" PRId64,

            mChannel->getName().string(), consumeBatches ? "true" : "false", frameTime);

#endif

services/inputflinger/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ cc_library_shared { 
    ],



    cflags: [

        "-Wall",

        "-Wextra",

        "-Werror",

        "-Wno-unused-parameter",

        // TODO: Move inputflinger to its own process and mark it hidden

        //-fvisibility=hidden

services/inputflinger/EventHub.cpp

+0 −6
Original line number Diff line number Diff line
@@ -69,12 +69,6 @@ namespace android { 
static const char *WAKE_LOCK_ID = "KeyEvents";

static const char *DEVICE_PATH = "/dev/input";



/* return the larger integer */

static inline int max(int v1, int v2)

{

    return (v1 > v2) ? v1 : v2;

}



static inline const char* toString(bool value) {

    return value ? "true" : "false";

}

services/inputflinger/InputDispatcher.cpp

+19 −19
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ InputDispatcher::KeyEntry* InputDispatcher::synthesizeKeyRepeatLocked(nsecs_t cu 
bool InputDispatcher::dispatchConfigurationChangedLocked(

        nsecs_t currentTime, ConfigurationChangedEntry* entry) {

#if DEBUG_OUTBOUND_EVENT_DETAILS

    ALOGD("dispatchConfigurationChanged - eventTime=%lld", entry->eventTime);

    ALOGD("dispatchConfigurationChanged - eventTime=%" PRId64, entry->eventTime);

#endif



    // Reset key repeating in case a keyboard device was added or removed or something.
@@ -701,7 +701,8 @@ bool InputDispatcher::dispatchConfigurationChangedLocked( 
bool InputDispatcher::dispatchDeviceResetLocked(

        nsecs_t currentTime, DeviceResetEntry* entry) {

#if DEBUG_OUTBOUND_EVENT_DETAILS

    ALOGD("dispatchDeviceReset - eventTime=%lld, deviceId=%d", entry->eventTime, entry->deviceId);

    ALOGD("dispatchDeviceReset - eventTime=%" PRId64 ", deviceId=%d", entry->eventTime,

            entry->deviceId);

#endif



    CancelationOptions options(CancelationOptions::CANCEL_ALL_EVENTS,
@@ -811,9 +812,9 @@ bool InputDispatcher::dispatchKeyLocked(nsecs_t currentTime, KeyEntry* entry, 


void InputDispatcher::logOutboundKeyDetailsLocked(const char* prefix, const KeyEntry* entry) {

#if DEBUG_OUTBOUND_EVENT_DETAILS

    ALOGD("%seventTime=%lld, deviceId=%d, source=0x%x, policyFlags=0x%x, "

    ALOGD("%seventTime=%" PRId64 ", deviceId=%d, source=0x%x, policyFlags=0x%x, "

            "action=0x%x, flags=0x%x, keyCode=0x%x, scanCode=0x%x, metaState=0x%x, "

            "repeatCount=%d, downTime=%lld",

            "repeatCount=%d, downTime=%" PRId64,

            prefix,

            entry->eventTime, entry->deviceId, entry->source, entry->policyFlags,

            entry->action, entry->flags, entry->keyCode, entry->scanCode, entry->metaState,
@@ -884,10 +885,10 @@ bool InputDispatcher::dispatchMotionLocked( 


void InputDispatcher::logOutboundMotionDetailsLocked(const char* prefix, const MotionEntry* entry) {

#if DEBUG_OUTBOUND_EVENT_DETAILS

    ALOGD("%seventTime=%lld, deviceId=%d, source=0x%x, policyFlags=0x%x, "

    ALOGD("%seventTime=%" PRId64 ", deviceId=%d, source=0x%x, policyFlags=0x%x, "

            "action=0x%x, actionButton=0x%x, flags=0x%x, "

            "metaState=0x%x, buttonState=0x%x,"

            "edgeFlags=0x%x, xPrecision=%f, yPrecision=%f, downTime=%lld",

            "edgeFlags=0x%x, xPrecision=%f, yPrecision=%f, downTime=%" PRId64,

            prefix,

            entry->eventTime, entry->deviceId, entry->source, entry->policyFlags,

            entry->action, entry->actionButton, entry->flags,
@@ -1132,8 +1133,6 @@ int32_t InputDispatcher::findTouchedWindowTargetsLocked(nsecs_t currentTime, 
        INJECTION_PERMISSION_DENIED

    };



    nsecs_t startTime = now();



    // For security reasons, we defer updating the touch state until we are sure that

    // event injection will be allowed.

    int32_t displayId = entry->displayId;
@@ -2233,7 +2232,7 @@ void InputDispatcher::synthesizeCancelationEventsForConnectionLocked( 


    if (!cancelationEvents.isEmpty()) {

#if DEBUG_OUTBOUND_EVENT_DETAILS

        ALOGD("channel '%s' ~ Synthesized %d cancelation events to bring channel back in sync "

        ALOGD("channel '%s' ~ Synthesized %zu cancelation events to bring channel back in sync "

                "with reality: %s, mode=%d.",

                connection->getInputChannelName(), cancelationEvents.size(),

                options.reason, options.mode);
@@ -2369,7 +2368,7 @@ InputDispatcher::splitMotionEvent(const MotionEntry* originalMotionEntry, BitSet 


void InputDispatcher::notifyConfigurationChanged(const NotifyConfigurationChangedArgs* args) {

#if DEBUG_INBOUND_EVENT_DETAILS

    ALOGD("notifyConfigurationChanged - eventTime=%lld", args->eventTime);

    ALOGD("notifyConfigurationChanged - eventTime=%" PRId64, args->eventTime);

#endif



    bool needWake;
@@ -2387,8 +2386,9 @@ void InputDispatcher::notifyConfigurationChanged(const NotifyConfigurationChange 


void InputDispatcher::notifyKey(const NotifyKeyArgs* args) {

#if DEBUG_INBOUND_EVENT_DETAILS

    ALOGD("notifyKey - eventTime=%lld, deviceId=%d, source=0x%x, policyFlags=0x%x, action=0x%x, "

            "flags=0x%x, keyCode=0x%x, scanCode=0x%x, metaState=0x%x, downTime=%lld",

    ALOGD("notifyKey - eventTime=%" PRId64

            ", deviceId=%d, source=0x%x, policyFlags=0x%x, action=0x%x, "

            "flags=0x%x, keyCode=0x%x, scanCode=0x%x, metaState=0x%x, downTime=%" PRId64,

            args->eventTime, args->deviceId, args->source, args->policyFlags,

            args->action, args->flags, args->keyCode, args->scanCode,

            args->metaState, args->downTime);
@@ -2482,9 +2482,9 @@ bool InputDispatcher::shouldSendKeyToInputFilterLocked(const NotifyKeyArgs* args 


void InputDispatcher::notifyMotion(const NotifyMotionArgs* args) {

#if DEBUG_INBOUND_EVENT_DETAILS

    ALOGD("notifyMotion - eventTime=%lld, deviceId=%d, source=0x%x, policyFlags=0x%x, "

    ALOGD("notifyMotion - eventTime=%" PRId64 ", deviceId=%d, source=0x%x, policyFlags=0x%x, "

            "action=0x%x, actionButton=0x%x, flags=0x%x, metaState=0x%x, buttonState=0x%x,"

            "edgeFlags=0x%x, xPrecision=%f, yPrecision=%f, downTime=%lld",

            "edgeFlags=0x%x, xPrecision=%f, yPrecision=%f, downTime=%" PRId64,

            args->eventTime, args->deviceId, args->source, args->policyFlags,

            args->action, args->actionButton, args->flags, args->metaState, args->buttonState,

            args->edgeFlags, args->xPrecision, args->yPrecision, args->downTime);
@@ -2562,9 +2562,9 @@ bool InputDispatcher::shouldSendMotionToInputFilterLocked(const NotifyMotionArgs 


void InputDispatcher::notifySwitch(const NotifySwitchArgs* args) {

#if DEBUG_INBOUND_EVENT_DETAILS

    ALOGD("notifySwitch - eventTime=%lld, policyFlags=0x%x, switchValues=0x%08x, switchMask=0x%08x",

            args->eventTime, args->policyFlags,

            args->switchValues, args->switchMask);

    ALOGD("notifySwitch - eventTime=%" PRId64 ", policyFlags=0x%x, switchValues=0x%08x, "

            "switchMask=0x%08x",

            args->eventTime, args->policyFlags, args->switchValues, args->switchMask);

#endif



    uint32_t policyFlags = args->policyFlags;
@@ -2575,7 +2575,7 @@ void InputDispatcher::notifySwitch(const NotifySwitchArgs* args) { 


void InputDispatcher::notifyDeviceReset(const NotifyDeviceResetArgs* args) {

#if DEBUG_INBOUND_EVENT_DETAILS

    ALOGD("notifyDeviceReset - eventTime=%lld, deviceId=%d",

    ALOGD("notifyDeviceReset - eventTime=%" PRId64 ", deviceId=%d",

            args->eventTime, args->deviceId);

#endif
@@ -3743,7 +3743,7 @@ bool InputDispatcher::afterKeyEventLockedInterruptible(const sp<Connection>& con 
                    msg.appendFormat(", %d->%d", fallbackKeys.keyAt(i),

                            fallbackKeys.valueAt(i));

                }

                ALOGD("Unhandled key event: %d currently tracked fallback keys%s.",

                ALOGD("Unhandled key event: %zu currently tracked fallback keys%s.",

                        fallbackKeys.size(), msg.string());

            }

#endif

services/inputflinger/InputReader.cpp

+9 −10
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ void InputReader::processEventsLocked(const RawEvent* rawEvents, size_t count) { 
                batchSize += 1;

            }

#if DEBUG_RAW_EVENTS

            ALOGD("BatchSize: %d Count: %d", batchSize, count);

            ALOGD("BatchSize: %zu Count: %zu", batchSize, count);

#endif

            processEventsForDeviceLocked(deviceId, rawEvent, batchSize);

        } else {
@@ -1176,7 +1176,7 @@ void InputDevice::process(const RawEvent* rawEvents, size_t count) { 
    size_t numMappers = mMappers.size();

    for (const RawEvent* rawEvent = rawEvents; count--; rawEvent++) {

#if DEBUG_RAW_EVENTS

        ALOGD("Input event: device=%d type=0x%04x code=0x%04x value=0x%08x when=%lld",

        ALOGD("Input event: device=%d type=0x%04x code=0x%04x value=0x%08x when=%" PRId64,

                rawEvent->deviceId, rawEvent->type, rawEvent->code, rawEvent->value,

                rawEvent->when);

#endif
@@ -1851,7 +1851,7 @@ void MultiTouchMotionAccumulator::process(const RawEvent* rawEvent) { 
#if DEBUG_POINTERS

            if (newSlot) {

                ALOGW("MultiTouch device emitted invalid slot index %d but it "

                        "should be between 0 and %d; ignoring this slot.",

                        "should be between 0 and %zd; ignoring this slot.",

                        mCurrentSlot, mSlotCount - 1);

            }

#endif
@@ -2147,9 +2147,9 @@ void VibratorInputMapper::vibrate(const nsecs_t* pattern, size_t patternSize, ss 
        if (i != 0) {

            patternStr.append(", ");

        }

        patternStr.appendFormat("%lld", pattern[i]);

        patternStr.appendFormat("%" PRId64, pattern[i]);

    }

    ALOGD("vibrate: deviceId=%d, pattern=[%s], repeat=%ld, token=%d",

    ALOGD("vibrate: deviceId=%d, pattern=[%s], repeat=%zd, token=%d",

            getDeviceId(), patternStr.string(), repeat, token);

#endif
@@ -2198,8 +2198,7 @@ void VibratorInputMapper::nextStep() { 
    nsecs_t duration = mPattern[mIndex];

    if (vibratorOn) {

#if DEBUG_VIBRATOR

        ALOGD("nextStep: sending vibrate deviceId=%d, duration=%lld",

                getDeviceId(), duration);

        ALOGD("nextStep: sending vibrate deviceId=%d, duration=%" PRId64, getDeviceId(), duration);

#endif

        getEventHub()->vibrate(getDeviceId(), duration);

    } else {
@@ -6631,7 +6630,7 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current) 
#if DEBUG_POINTER_ASSIGNMENT

    ALOGD("assignPointerIds - initial distance min-heap: size=%d", heapSize);

    for (size_t i = 0; i < heapSize; i++) {

        ALOGD("  heap[%d]: cur=%d, last=%d, distance=%lld",

        ALOGD("  heap[%zu]: cur=%d, last=%d, distance=%" PRId64,

                i, heap[i].currentPointerIndex, heap[i].lastPointerIndex,

                heap[i].distance);

    }
@@ -6677,7 +6676,7 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current) 
#if DEBUG_POINTER_ASSIGNMENT

                ALOGD("assignPointerIds - reduced distance min-heap: size=%d", heapSize);

                for (size_t i = 0; i < heapSize; i++) {

                    ALOGD("  heap[%d]: cur=%d, last=%d, distance=%lld",

                    ALOGD("  heap[%zu]: cur=%d, last=%d, distance=%" PRId64,

                            i, heap[i].currentPointerIndex, heap[i].lastPointerIndex,

                            heap[i].distance);

                }
@@ -6703,7 +6702,7 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current) 
            usedIdBits.markBit(id);



#if DEBUG_POINTER_ASSIGNMENT

            ALOGD("assignPointerIds - matched: cur=%d, last=%d, id=%d, distance=%lld",

            ALOGD("assignPointerIds - matched: cur=%d, last=%d, id=%d, distance=%" PRId64,

                    lastPointerIndex, currentPointerIndex, id, heap[0].distance);

#endif

            break;