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

Commit c05e232e authored by George Burgess IV's avatar George Burgess IV Committed by android-build-merger
Browse files

Merge "Fix -Wdouble-promotion warnings" am: 79205572 

am: f2528e2d

Change-Id: I002b3954932af2c13b81b6f5d2e46b157f730e1e
parents 417c5464 f2528e2d

libs/ui/GraphicBufferAllocator.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -55,7 +55,7 @@ void GraphicBufferAllocator::dump(String8& result) const 
        const alloc_rec_t& rec(list.valueAt(i));

        const alloc_rec_t& rec(list.valueAt(i));

        if (rec.size) {

        if (rec.size) {

            snprintf(buffer, SIZE, "%10p: %7.2f KiB | %4u (%4u) x %4u | %8X | 0x%08x | %s\n",

            snprintf(buffer, SIZE, "%10p: %7.2f KiB | %4u (%4u) x %4u | %8X | 0x%08x | %s\n",

                    list.keyAt(i), rec.size/1024.0f,

                    list.keyAt(i), rec.size/1024.0,

                    rec.width, rec.stride, rec.height, rec.format, rec.usage,

                    rec.width, rec.stride, rec.height, rec.format, rec.usage,

                    rec.requestorName.c_str());

                    rec.requestorName.c_str());

        } else {

        } else {
@@ -67,7 +67,7 @@ void GraphicBufferAllocator::dump(String8& result) const 
        result.append(buffer);

        result.append(buffer);

        total += rec.size;

        total += rec.size;

    }

    }

    snprintf(buffer, SIZE, "Total allocated (estimate): %.2f KB\n", total/1024.0f);

    snprintf(buffer, SIZE, "Total allocated (estimate): %.2f KB\n", total/1024.0);

    result.append(buffer);

    result.append(buffer);

    std::string deviceDump = mDevice->dump();

    std::string deviceDump = mDevice->dump();

    result.append(deviceDump.c_str(), deviceDump.size());

    result.append(deviceDump.c_str(), deviceDump.size());