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

Commit 62b3f369 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

am: c05e232e

Change-Id: Ic9efe4849e9b88e2340ff8fb4fa57cc8ed3388d6
parents b941ea5b c05e232e
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ void GraphicBufferAllocator::dump(String8& result) const
        const alloc_rec_t& rec(list.valueAt(i));
        if (rec.size) {
            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.requestorName.c_str());
        } else {
@@ -67,7 +67,7 @@ void GraphicBufferAllocator::dump(String8& result) const
        result.append(buffer);
        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);
    std::string deviceDump = mDevice->dump();
    result.append(deviceDump.c_str(), deviceDump.size());