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

Commit 7cc9405f authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "Enable the APEX support on the device side." 

am: 239245fe

Change-Id: I0f4a246c205f4dd382cc7135c166b63c3651f53a
parents e2d54348 239245fe

adb/transport.cpp

+5 −8
Original line number Diff line number Diff line
@@ -1009,10 +1009,7 @@ size_t atransport::get_max_payload() const { 
const FeatureSet& supported_features() {

    // Local static allocation to avoid global non-POD variables.

    static const FeatureSet* features = new FeatureSet{

        kFeatureShell2, kFeatureCmd, kFeatureStat2, kFeatureFixedPushMkdir,

#if ADB_HOST

                kFeatureApex

#endif

            kFeatureShell2, kFeatureCmd, kFeatureStat2, kFeatureFixedPushMkdir, kFeatureApex

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