Merge "Fix adb."

am: 50d606528d

Change-Id: I55b6c174b4e57086b370e44ff7c0de053f2b4ad6
This commit is contained in:
Josh Gao 2016-09-02 08:46:07 +00:00 committed by android-build-merger
commit ff6d1a9656

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