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

Commit 4f911e3b authored by Josh Gao's avatar Josh Gao
Browse files

adb: switch version back to 40. 

The version bump we did wasn't actually needed, since adbd doesn't
check for either feature flag we added. Revert the change and clarify
the comment suggesting the version bump when adding features.

Test: ./test_adb.py
Test: ./test_device.py
Change-Id: I92e7f392bcb36b3bf9a236f2d31ba5133de8d72a
parent 2141f9a6

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;