commit 230847b147dba585b105c57c3b23902c0296b89d
author Josh Gao <jmgao@google.com> Fri Sep 02 08:55:35 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Sep 02 08:55:35 2016 +0000
tree fc4e9971a3c13cdb77c248ea6eaaae570f54b95f
parent 81d7e64e09df5a89595701a7904c4de28efcbf0c
parent df7f541e6f4b86c60d4f98711a9de278c78dfeb9

Merge "Fix adb." am: 50d606528d am: ff6d1a9656 am: e95214c467
am: 5195499e97

Change-Id: I703868ed2083b1954fb1fc65f00b2b393dbcf664

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;
 }