commit bb54e20ba9afcf61cc6b41500ff8ab3dfc897203
author Andy Hung <hunga@google.com> Fri Oct 05 11:42:02 2018 -0700
committer Andy Hung <hunga@google.com> Mon Oct 08 12:59:33 2018 -0700
tree 99d0c86990fbf905083d4f41c215311ec75c4e09
parent d10b735cfd4eea74846bb5f53d37c8c2a3114d58

AudioPolicyManager: Convert dump to use String8 (part 1)

Test: dumpsys of APM, diffs.
Bug: 117333182
Change-Id: Ic046acb491efa363423b38a389b046c09ae9d5c9

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 5ea82a7..21f893a 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2707,32 +2707,33 @@
     result.appendFormat(" TTS output %savailable\n", mTtsOutputAvailable ? "" : "not ");
     result.appendFormat(" Master mono: %s\n", mMasterMono ? "on" : "off");
     result.appendFormat(" Config source: %s\n", getConfig().getSource().c_str());
+    mAvailableOutputDevices.dump(&result, String8("Available output"));
+    mAvailableInputDevices.dump(&result, String8("Available input"));
+    mHwModulesAll.dump(&result);
+    mOutputs.dump(&result);
+    mInputs.dump(&result);
     write(fd, result.string(), result.size());
 
-    mAvailableOutputDevices.dump(fd, String8("Available output"));
-    mAvailableInputDevices.dump(fd, String8("Available input"));
-    mHwModulesAll.dump(fd);
-    mOutputs.dump(fd);
-    mInputs.dump(fd);
+    // TODO convert these to dump to string.
     mVolumeCurves->dump(fd);
     mEffects.dump(fd);
     mAudioPatches.dump(fd);
     mPolicyMixes.dump(fd);
-    mAudioSources.dump(fd);
 
+    result.clear();
+    mAudioSources.dump(&result);
     if (!mSurroundFormats.empty()) {
-        result = String8("\nEnabled Surround Formats:\n");
+        result.append("\nEnabled Surround Formats:\n");
         size_t i = 0;
         for (const auto& fmt : mSurroundFormats) {
             result.append(i++ == 0 ? "  " : ", ");
             std::string sfmt;
             FormatConverter::toString(fmt, sfmt);
-            result.appendFormat("%s", sfmt.c_str());
+            result.append(sfmt.c_str());
         }
         result.append("\n");
-        write(fd, result.string(), result.size());
     }
-
+    write(fd, result.string(), result.size());
     return NO_ERROR;
 }