commit c705e22dbdbfe2dabe90483529e32e8fcca003d9
author Josh Gao <jmgao@google.com> Fri Sep 02 08:46:07 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 08:46:07 2016 +0000
tree c0b19cb30c2a02b6e07c02265ede735994adce2c
parent aa7c7ec77b4aa57dbd11d4d81f809bee26094909
parent 0e6c31baccb622ee924536adcb6107c12a53dbcf

Merge "Fix adb."
am: 50d606528d

Change-Id: I55b6c174b4e57086b370e44ff7c0de053f2b4ad6

adb/adb_client.cpp

diff --git a/adb/adb_client.cpp b/adb/adb_client.cpp
index 0b2fc1e..919e1c1 100644
--- a/adb/adb_client.cpp
+++ b/adb/adb_client.cpp
@@ -60,8 +60,8 @@
 }
 
 void adb_set_socket_spec(const char* socket_spec) {
-    if (!__adb_server_socket_spec) {
-        LOG(FATAL) << "attempted to reinitialize adb_server_socket_spec";
+    if (__adb_server_socket_spec) {
+        LOG(FATAL) << "attempted to reinitialize adb_server_socket_spec " << socket_spec << " (was " << __adb_server_socket_spec << ")";
     }
     __adb_server_socket_spec = socket_spec;
 }