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

Commit 7321529e authored by Siarhei Vishniakou's avatar Siarhei Vishniakou
Browse files

Fix logging in InputReader 

PointerDistanceHeapElement::distance is
actually uint64_t, so print it with PRIu64.

Bug: 64258224
Test: build with define DEBUG_POINTER_ASSIGNMENT 1
Change-Id: I6c6f475a1a68cfa4ff3869f21bd9d94d8b89ac55
parent b499f1a6

services/inputflinger/InputReader.cpp

+5 −5
Original line number Diff line number Diff line
@@ -6630,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[%zu]: cur=%d, last=%d, distance=%" PRId64,

        ALOGD("  heap[%zu]: cur=%" PRIu32 ", last=%" PRIu32 ", distance=%" PRIu64,

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

                heap[i].distance);

    }
@@ -6676,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[%zu]: cur=%d, last=%d, distance=%" PRId64,

                    ALOGD("  heap[%zu]: cur=%" PRIu32 ", last=%" PRIu32 ", distance=%" PRIu64,

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

                            heap[i].distance);

                }
@@ -6702,7 +6702,8 @@ 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=%" PRId64,

            ALOGD("assignPointerIds - matched: cur=%" PRIu32 ", last=%" PRIu32

                    ", id=%" PRIu32 ", distance=%" PRIu64,

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

#endif

            break;
@@ -6720,8 +6721,7 @@ void TouchInputMapper::assignPointerIds(const RawState* last, RawState* current) 
                current->rawPointerData.isHovering(currentPointerIndex));



#if DEBUG_POINTER_ASSIGNMENT

        ALOGD("assignPointerIds - assigned: cur=%d, id=%d",

                currentPointerIndex, id);

        ALOGD("assignPointerIds - assigned: cur=%" PRIu32 ", id=%" PRIu32, currentPointerIndex, id);

#endif

    }

}