Merge "Add host feature for push --sync support." am: 886e6cac05

am: e2d7a50b69

Change-Id: Ia03072145441e4586c36fb93f073b29ba3288cc3
This commit is contained in:
Dan Albert 2017-05-23 23:41:17 +00:00 committed by android-build-merger
commit 311f93faca
3 changed files with 4 additions and 0 deletions

View file

@ -1140,6 +1140,7 @@ int handle_host_request(const char* service, TransportType type,
if (should_use_libusb()) {
features.insert(kFeatureLibusb);
}
features.insert(kFeaturePushSync);
SendOkay(reply_fd, FeatureSetToString(features));
return 0;
}

View file

@ -55,6 +55,7 @@ const char* const kFeatureShell2 = "shell_v2";
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;

View file

@ -51,6 +51,8 @@ extern const char* const kFeatureCmd;
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: