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

Commit 5587aba5 authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Fix `adb logcat` return code."

parents 445eacd3 31f0f1bc

adb/client/commandline.cpp

+4 −5
Original line number Diff line number Diff line
@@ -1136,8 +1136,7 @@ static int logcat(int argc, const char** argv) { 
        cmd += " " + escape_arg(*argv++);

    }



    // No need for shell protocol with logcat, always disable for simplicity.

    return send_shell_command(cmd, true);

    return send_shell_command(cmd);

}



static void write_zeros(int bytes, int fd) {
@@ -1861,7 +1860,7 @@ static int uninstall_app(int argc, const char** argv) { 
        cmd += " " + escape_arg(*argv++);

    }



    return send_shell_command(cmd, false);

    return send_shell_command(cmd);

}



static int install_app(int argc, const char** argv) {
@@ -2049,7 +2048,7 @@ static int pm_command(int argc, const char** argv) { 
        cmd += " " + escape_arg(*argv++);

    }



    return send_shell_command(cmd, false);

    return send_shell_command(cmd);

}



static int uninstall_app_legacy(int argc, const char** argv) {
@@ -2073,7 +2072,7 @@ static int uninstall_app_legacy(int argc, const char** argv) { 


static int delete_file(const std::string& filename) {

    std::string cmd = "rm -f " + escape_arg(filename);

    return send_shell_command(cmd, false);

    return send_shell_command(cmd);

}



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

adb/client/commandline.h

+2 −2
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ int adb_commandline(int argc, const char** argv); 
// resulting output.

// if |callback| is non-null, stdout/stderr output will be handled by it.

int send_shell_command(

    const std::string& command, bool disable_shell_protocol,

        const std::string& command, bool disable_shell_protocol = false,

        StandardStreamsCallbackInterface* callback = &DEFAULT_STANDARD_STREAMS_CALLBACK);



#endif  // COMMANDLINE_H