Fix AudioFlinger dump
Test: Manual dump verification
Bug: 248629696
Bug: 246519029
Change-Id: I28362fd37f919399afe4077c04f76a7eba75a32d
diff --git a/media/utils/include/mediautils/SharedMemoryAllocator.h b/media/utils/include/mediautils/SharedMemoryAllocator.h
index cf3a662..17c1ac9 100644
--- a/media/utils/include/mediautils/SharedMemoryAllocator.h
+++ b/media/utils/include/mediautils/SharedMemoryAllocator.h
@@ -325,8 +325,8 @@
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();
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 3e9400b..a86eefb 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -731,12 +731,11 @@
{
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());
}
}