commit 3c7cfd4d1c58e2adb47f80893431fa06a5c36f71
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 22 01:57:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Jan 22 01:57:44 2020 +0000
tree 044d23b99986d5517e5c6ecefe9f3e50cac3aadb
parent 2d727c2dfbbcbbb8122db0338c0ddf4224ad7147
parent 171508097106d16046ed723a42ab8221d69d1dff

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

Change-Id: Idc502020d9c729dc0206e6f9b714a1a46eab27d1

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;
     }