Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 311f93fa authored by Dan Albert's avatar Dan Albert Committed by android-build-merger
Browse files

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

am: e2d7a50b

Change-Id: Ia03072145441e4586c36fb93f073b29ba3288cc3
parents 5fccd074 e2d7a50b

adb/adb.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;

    }

adb/transport.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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;

adb/transport.h

+2 −0
Original line number Diff line number Diff line
@@ -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: