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

Commit 08f8da2f authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "adb: fix adb remount -R" am: 948e4fa3 am: a8ed306b 

am: 757b12a0

Change-Id: I249bb9b4abd799de2e62dcd70bb17bb74c739d66
parents 5d34b612 757b12a0

adb/client/commandline.cpp

+6 −2
Original line number Diff line number Diff line
@@ -1713,8 +1713,12 @@ int adb_commandline(int argc, const char** argv) { 
        }



        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:");

        }