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

Commit 21da7091 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix AudioFlinger dump"

parents bf9a1ecd 9ec58d55

media/utils/include/mediautils/SharedMemoryAllocator.h

+2 −2
Original line number Diff line number Diff line
@@ -325,8 +325,8 @@ class SnoopingAllocator { 
                continue;

            }

            const auto heap = handle->getMemory();

            dump << std::setw(8) << heap->getHeapID() << std::setw(8) << heap->getOffset()

                 << std::setw(8) << heap->getSize() << std::setw(8) << value.allocation_number

            dump << std::setw(8) << heap->getHeapID() << std::setw(8) << heap->getSize()

                 << std::setw(8) << heap->getOffset() << std::setw(8) << value.allocation_number

                 << "   " << value.name << "\n";

        }

        return dump.str();

services/audioflinger/AudioFlinger.cpp

+2 −3
Original line number Diff line number Diff line
@@ -731,12 +731,11 @@ void AudioFlinger::dumpClients(int fd, const Vector<String16>& args __unused) 
{

    String8 result;



    result.append("Clients:\n");

    result.append("   pid    heap_size\n");

    result.append("Client Allocators:\n");

    for (size_t i = 0; i < mClients.size(); ++i) {

        sp<Client> client = mClients.valueAt(i).promote();

        if (client != 0) {

          result.append("Client: %d\n", client->pid());

          result.appendFormat("Client: %d\n", client->pid());

          result.append(client->allocator().dump().c_str());

        }

   }