commit d9f2335ab719dee3091420ec5665609f451a928b
author Keun-young Park <keunyoung@google.com> Thu Oct 14 21:49:05 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Oct 14 21:49:05 2021 +0000
tree 372c0bddcf17f5e48dcfe38a24d704cb1dd0046c
parent 20bdf84535b6fe1fa8dd7568f98895b399a35518
parent 22b0c0fca01c6e7cf56b6bb869726455306103a5

Merge "Fix vold dump" am: bba0592dce am: 22b0c0fca0

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1856933

Change-Id: I0a3dd874fd00d7b35a47ed1067836b597f5961ca

VoldNativeService.cpp

diff --git a/VoldNativeService.cpp b/VoldNativeService.cpp
index cad92f5..b4b9276 100644
--- a/VoldNativeService.cpp
+++ b/VoldNativeService.cpp
@@ -26,6 +26,7 @@
 #include <private/android_filesystem_config.h>
 #include <utils/Trace.h>
 
+#include <stdio.h>
 #include <sys/vfs.h>
 #include <fstream>
 #include <thread>
@@ -133,15 +134,14 @@
 }
 
 status_t VoldNativeService::dump(int fd, const Vector<String16>& /* args */) {
-    auto out = std::fstream(StringPrintf("/proc/self/fd/%d", fd));
     const binder::Status dump_permission = CheckPermission(kDump);
     if (!dump_permission.isOk()) {
-        out << dump_permission.toString8() << endl;
+        dprintf(fd, "%s\n", dump_permission.toString8().c_str());
         return PERMISSION_DENIED;
     }
 
     ACQUIRE_LOCK;
-    out << "vold is happy!" << endl;
+    dprintf(fd, "vold is happy!\n");
     return NO_ERROR;
 }