commit a6bfcefc8a6d7ea1bd2b60f9e3bbeba6ea5cdc33
author Treehugger Robot <treehugger-gerrit@google.com> Wed Sep 18 18:48:58 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 18 18:48:58 2019 +0000
tree 57b68d7d66ae5a35e31c6b254defcc71fdf33b44
parent 59a26b874678e9a1357b2c5818c76315efed3efe
parent 7c9acca06c0bdaee2297b6ee78bf967ea44d7f17

Merge "adb: fix adb remount -R"

adb/client/commandline.cpp

diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp
index fe2bdfe..a0818d3 100644
--- a/adb/client/commandline.cpp
+++ b/adb/client/commandline.cpp
@@ -1713,8 +1713,12 @@
         }
 
         if (CanUseFeature(features, kFeatureRemountShell)) {
-            const char* arg[2] = {"shell", "remount"};
-            return adb_shell(2, arg);
+            std::vector<const char*> args = {"shell"};
+            args.insert(args.cend(), argv, argv + argc);
+            return adb_shell(args.size(), args.data());
+        } else if (argc > 1) {
+            auto command = android::base::StringPrintf("%s:%s", argv[0], argv[1]);
+            return adb_connect_command(command);
         } else {
             return adb_connect_command("remount:");
         }