Merge "Fix adb." am: 50d606528d

am: ff6d1a9656

Change-Id: I270efbd5555b7ef8088225f5ea8cdc6ea0cd343d
This commit is contained in:
Josh Gao 2016-09-02 08:49:04 +00:00 committed by android-build-merger
commit e95214c467

View file

@ -60,8 +60,8 @@ void adb_get_transport(TransportType* type, const char** serial) {
}
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;
}