Merge "adb: relax serial matching rules." am: bf889742f2
am: 668c38516f
* commit '668c38516fae82829c0f5e0a4091fb6cb5d389cc':
adb: relax serial matching rules.
diff --git a/commandline.cpp b/commandline.cpp
index 37d1146..ff4eb22 100644
--- a/commandline.cpp
+++ b/commandline.cpp
@@ -157,7 +157,7 @@
" (-r: replace existing application)\n"
" (-t: allow test packages)\n"
" (-s: install application on sdcard)\n"
- " (-d: allow version code downgrade)\n"
+ " (-d: allow version code downgrade (debuggable packages only))\n"
" (-g: grant all runtime permissions)\n"
" adb install-multiple [-lrtsdpg] <file...>\n"
" - push this package file to the device and install it\n"
@@ -165,7 +165,7 @@
" (-r: replace existing application)\n"
" (-t: allow test packages)\n"
" (-s: install application on sdcard)\n"
- " (-d: allow version code downgrade)\n"
+ " (-d: allow version code downgrade (debuggable packages only))\n"
" (-p: partial application install)\n"
" (-g: grant all runtime permissions)\n"
" adb uninstall [-k] <package> - remove this app package from the device\n"
diff --git a/transport.cpp b/transport.cpp
index e3340af..f86a222 100644
--- a/transport.cpp
+++ b/transport.cpp
@@ -781,9 +781,7 @@
// Local static allocation to avoid global non-POD variables.
static const FeatureSet* features = new FeatureSet{
kFeatureShell2,
- // Internal master has 'cmd'. AOSP master doesn't.
- // kFeatureCmd
-
+ 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).