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

Commit 88b71d41 authored by David Pursell's avatar David Pursell Committed by Android Git Automerger
Browse files

am edf0728e: am a36f4d68: Merge "adb: bump server version to prevent feature mismatch." 

* commit 'edf0728e':
  adb: bump server version to prevent feature mismatch.
parents 0f427fea edf0728e

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ constexpr size_t MAX_PAYLOAD = MAX_PAYLOAD_V2; 
std::string adb_version();



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

#define ADB_SERVER_VERSION 32

#define ADB_SERVER_VERSION 33



class atransport;

struct usb_handle;

adb/transport.cpp

+3 −0
Original line number Diff line number Diff line
@@ -786,6 +786,9 @@ const FeatureSet& supported_features() { 
    // Local static allocation to avoid global non-POD variables.

    static const FeatureSet* features = new FeatureSet{

        kFeatureShell2

        // 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).

    };



    return *features;