commit ce6ab18802c6e691c37db212550a51922605c3d3
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 22 02:11:14 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 22 02:11:14 2020 +0000
tree 7d55886206076dbbf16d96dbfeb4d9be8f9d19c0
parent 4d6ce2a2b747f270a546b7424e25bf04845a6a0a
parent 3c7cfd4d1c58e2adb47f80893431fa06a5c36f71

Merge "adb: windows: fix adb execute root cmd with no tips" am: 02f535f582 am: a35a2e21c2 am: 5a51ed5422

Change-Id: Iaed9ace9ae9df2c9d731fd50368007f6fbee4a6d

adb/client/commandline.cpp

diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index 83b9238..a6d7e31 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -1125,8 +1125,8 @@
         return false;
     }
 
+    fwrite(buf, 1, sizeof(buf) - bytes_left, stdout);
     fflush(stdout);
-    WriteFdExactly(STDOUT_FILENO, buf, sizeof(buf) - bytes_left);
     if (cur != buf && strstr(buf, "restarting") == nullptr) {
         return true;
     }