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

Commit 0e9db4a7 authored by Mitch Phillips's avatar Mitch Phillips Committed by Automerger Merge Worker
Browse files

Merge "fix integer promotion in logging." am: 27174df9 am: 8ff46966 

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

Change-Id: I9c29916532761fe6632384d9f3e8eed14717ad69
parents a64b3351 8ff46966

libs/binder/MemoryDealer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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;