Merge "adb: avoid consuming input in `adb remount`."

                       service_string);

}

static int adb_shell_noinput(int argc, const char** argv) {

#if !defined(_WIN32)

    unique_fd fd(adb_open("/dev/null", O_RDONLY));

    CHECK_NE(STDIN_FILENO, fd.get());

    dup2(fd.get(), STDIN_FILENO);

#endif

    return adb_shell(argc, argv);

}

static int adb_sideload_legacy(const char* filename, int in_fd, int size) {

    std::string error;

    unique_fd out_fd(adb_connect(android::base::StringPrintf("sideload:%d", size), &error));

        if (CanUseFeature(features, kFeatureRemountShell)) {

            std::vector<const char*> args = {"shell"};

            args.insert(args.cend(), argv, argv + argc);

            return adb_shell(args.size(), args.data());

            return adb_shell_noinput(args.size(), args.data());

        } else if (argc > 1) {

            auto command = android::base::StringPrintf("%s:%s", argv[0], argv[1]);

            return adb_connect_command(command);