diff options
| author | Josh Gao <jmgao@google.com> | 2018-11-01 13:16:15 -0700 |
|---|---|---|
| committer | Josh Gao <jmgao@google.com> | 2018-11-01 13:25:31 -0700 |
| commit | 4f911e3bf618d3d3bd6cc7d1617e69a2b8c70b1c (patch) | |
| tree | 733262c885064b862acfd60fc07775a8c193e051 /adb/transport.cpp | |
| parent | 2141f9a6c49f78ed5ca51fa68a65df3a0c45ccbc (diff) | |
| download | system_core-4f911e3bf618d3d3bd6cc7d1617e69a2b8c70b1c.tar.gz system_core-4f911e3bf618d3d3bd6cc7d1617e69a2b8c70b1c.tar.bz2 system_core-4f911e3bf618d3d3bd6cc7d1617e69a2b8c70b1c.zip | |
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
Diffstat (limited to 'adb/transport.cpp')
| -rw-r--r-- | adb/transport.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/adb/transport.cpp b/adb/transport.cpp index 03a9f3042..c2d4917ea 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp @@ -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; |