diff options
| author | 2020-07-08 17:36:37 +0000 | |
|---|---|---|
| committer | 2020-07-08 17:36:37 +0000 | |
| commit | 2dbcd49793047bbfff535f813a607fe6ba2bd90c (patch) | |
| tree | 11268dc8ffa5d2b485bb2446acd7f35b15740af3 | |
| parent | 1595bbc59437a513998c493625274d8e9b96d046 (diff) | |
| parent | b46878b9e32cf909ffc7a0b42b65d4a743a74415 (diff) | |
Merge "fix integer promotion in logging." am: 27174df9cc am: 8ff469661b am: 0e9db4a752 am: 21dcb37a36 am: b46878b9e3
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1353864
Change-Id: I9ca32906ea1175a4de32b823ac3ceab00ade6df1
| -rw-r--r-- | libs/binder/MemoryDealer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/binder/MemoryDealer.cpp b/libs/binder/MemoryDealer.cpp index ebf91f925e..b46b3e88fc 100644 --- a/libs/binder/MemoryDealer.cpp +++ b/libs/binder/MemoryDealer.cpp @@ -387,7 +387,7 @@ SimpleBestFitAllocator::chunk_t* SimpleBestFitAllocator::dealloc(size_t start) 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 @@ SimpleBestFitAllocator::chunk_t* SimpleBestFitAllocator::dealloc(size_t start) } #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; |