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

Commit 54b5e853 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "AOSP master doesn't have "cmd"."

parents ae2a64e2 79e1c7a7

adb/transport.cpp

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

    static const FeatureSet* features = new FeatureSet{

        kFeatureShell2,

        kFeatureCmd

        // Internal master has 'cmd'. AOSP master doesn't.

        // kFeatureCmd



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