commit 7321529ef7a865c08180ba41017621b7defa2be4
author Siarhei Vishniakou <svv@google.com> Fri Oct 13 11:02:44 2017 -0700
committer Siarhei Vishniakou <svv@google.com> Fri Oct 13 11:02:44 2017 -0700
tree 1bf4ee98fbc1ceae23884017e649984fd87bcd9c
parent b499f1a675ae986e0db9c75e481a101e17ec8ec3

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

services/inputflinger/InputReader.cpp

diff --git a/services/inputflinger/InputReader.cpp b/services/inputflinger/InputReader.cpp
index 60f2286..6dd12d6 100644
--- a/services/inputflinger/InputReader.cpp
+++ b/services/inputflinger/InputReader.cpp
@@ -6630,7 +6630,7 @@
 #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 @@
 #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 @@
             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 @@
                 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
     }
 }