Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(661)

Unified Diff: tools/android/common/adb_connection.cc

Issue 9415018: Revert 122320 - fake_dns tool for Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/all_android.gyp ('k') | tools/android/common/net.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/common/adb_connection.cc
===================================================================
--- tools/android/common/adb_connection.cc (revision 122347)
+++ tools/android/common/adb_connection.cc (working copy)
@@ -83,8 +83,17 @@
kBufferMaxLength, 0));
if (response_length < kAdbStatusLength ||
strncmp("OKAY", response, kAdbStatusLength) != 0) {
+ char fail_msg_buffer[kBufferMaxLength * 3 + 1];
+ char* p = fail_msg_buffer;
+ for (int i = 0; i < response_length; ++i) {
+ snprintf(p, 3, "%02x,", static_cast<unsigned char>(response[i]));
+ p += 3;
+ }
+
+ if (p > fail_msg_buffer)
+ *(--p) = 0; // Eliminate the last comma.
LOG(ERROR) << "Bad response from ADB: length: " << response_length
- << " data: " << DumpBinary(response, response_length);
+ << " data: " << fail_msg_buffer;
HANDLE_EINTR(close(host_socket));
return -1;
}
« no previous file with comments | « build/all_android.gyp ('k') | tools/android/common/net.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698