diff options
| author | 2017-10-13 19:58:39 +0000 | |
|---|---|---|
| committer | 2017-10-13 19:58:39 +0000 | |
| commit | 0738a1ff34fc1a8d245ec0f7eff5a88c7a52ac9d (patch) | |
| tree | 929a0e47459dda7b89b70d824e25a23b3710fd90 | |
| parent | f86eba043e38c51af5546974a2c31713818ceede (diff) | |
| parent | 7321529ef7a865c08180ba41017621b7defa2be4 (diff) | |
Merge "Fix logging in InputReader"
| -rw-r--r-- | services/inputflinger/InputReader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp index 60f2286625..6dd12d6bdd 100644 --- a/services/inputflinger/InputReader.cpp +++ b/services/inputflinger/InputReader.cpp @@ -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 } } |