commit 886e6cac0558d5b2dcb902766ed44ba3f061b896
author Treehugger Robot <treehugger-gerrit@google.com> Tue May 23 23:30:22 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 23 23:30:23 2017 +0000
tree fed7766f5f4d44e84af24345f7c16bb2dec68792
parent 0f185bb1484e22cf270c5807d0228880281e408f
parent 5176df8d4a3f43aed35aa17508a0eb862c262ea4

Merge "Add host feature for `push --sync` support."

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 808d8ff..a7706a0 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -1140,6 +1140,7 @@
         if (should_use_libusb()) {
             features.insert(kFeatureLibusb);
         }
+        features.insert(kFeaturePushSync);
         SendOkay(reply_fd, FeatureSetToString(features));
         return 0;
     }

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index 24e90cf..308ee8d 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -55,6 +55,7 @@
 const char* const kFeatureCmd = "cmd";
 const char* const kFeatureStat2 = "stat_v2";
 const char* const kFeatureLibusb = "libusb";
+const char* const kFeaturePushSync = "push_sync";
 
 static std::string dump_packet(const char* name, const char* func, apacket* p) {
     unsigned command = p->msg.command;

adb/transport.h

diff --git a/adb/transport.h b/adb/transport.h
index 7304404..57fc988 100644
--- a/adb/transport.h
+++ b/adb/transport.h
@@ -51,6 +51,8 @@
 extern const char* const kFeatureStat2;
 // The server is running with libusb enabled.
 extern const char* const kFeatureLibusb;
+// The server supports `push --sync`.
+extern const char* const kFeaturePushSync;
 
 class atransport {
 public: