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

Commit 7738fa3b authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: switch version back to 40." 

am: 9c27dde8

Change-Id: Ief324e68306ea953bbf1c2279b838e7a9cc436b4
parents 75de6655 9c27dde8

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ constexpr size_t LINUX_MAX_SOCKET_SIZE = 4194304; 
std::string adb_version();



// Increment this when we want to force users to start a new adb server.

#define ADB_SERVER_VERSION 41

#define ADB_SERVER_VERSION 40



using TransportId = uint64_t;

class atransport;

adb/transport.cpp

+4 −3
Original line number Diff line number Diff line
@@ -1013,9 +1013,10 @@ const FeatureSet& supported_features() { 
#if ADB_HOST

                kFeatureApex

#endif

        // Increment ADB_SERVER_VERSION whenever the feature list changes to

        // make sure that the adb client and server features stay in sync

        // (http://b/24370690).

        // Increment ADB_SERVER_VERSION when adding a feature that adbd needs

        // to know about. Otherwise, the client can be stuck running an old

        // version of the server even after upgrading their copy of adb.

        // (http://b/24370690)

    };



    return *features;