Merge "adb: bail out if wait_for_device fails in send_shell_command."

This commit is contained in:
Josh Gao 2016-02-25 18:43:42 +00:00 committed by Gerrit Code Review
commit 4e5b292299

View file

@ -1106,8 +1106,9 @@ static int send_shell_command(TransportType transport_type, const char* serial,
} }
fprintf(stderr,"- waiting for device -\n"); fprintf(stderr,"- waiting for device -\n");
adb_sleep_ms(1000); if (!wait_for_device("wait-for-device", transport_type, serial)) {
wait_for_device("wait-for-device", transport_type, serial); return 1;
}
} }
int exit_code = read_and_dump(fd, use_shell_protocol); int exit_code = read_and_dump(fd, use_shell_protocol);