commit 0e9db4a75259e56d71f61a0bfabf40687a62ecf8
author Mitch Phillips <mitchp@google.com> Wed Jul 08 17:01:42 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jul 08 17:01:42 2020 +0000
tree 65ff160b403d0a129e195796717e14d3c6706480
parent a64b3351f05fab45f965c57bd1ea6d91fc423f64
parent 8ff469661b23efeeab1c44d6265d41c5bf9f335a

Merge "fix integer promotion in logging." am: 27174df9cc am: 8ff469661b

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1353864

Change-Id: I9c29916532761fe6632384d9f3e8eed14717ad69

libs/binder/MemoryDealer.cpp

diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp
index ebf91f9..b46b3e8 100644
--- a/libs/binder/MemoryDealer.cpp
+++ b/libs/binder/MemoryDealer.cpp
@@ -387,7 +387,7 @@
     while (cur) {
         if (cur->start == start) {
             LOG_FATAL_IF(cur->free,
-                "block at offset 0x%08lX of size 0x%08lX already freed",
+                "block at offset 0x%08lX of size 0x%08X already freed",
                 cur->start*kMemoryAlign, cur->size*kMemoryAlign);
 
             // merge freed blocks together
@@ -411,7 +411,7 @@
                 }
             #endif
             LOG_FATAL_IF(!freed->free,
-                "freed block at offset 0x%08lX of size 0x%08lX is not free!",
+                "freed block at offset 0x%08lX of size 0x%08X is not free!",
                 freed->start * kMemoryAlign, freed->size * kMemoryAlign);
 
             return freed;