diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 10:16:43 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-03-18 10:16:43 +0100 |
| commit | 7f2bb91aecbdc8af268c56f80034d8f3dc0204aa (patch) | |
| tree | 59506f762d56cb9a31856509496553707fcfd6a9 /adb/adb.cpp | |
| parent | 6309ce85786ff96bd04f62dd5cb62a7b0c69f763 (diff) | |
| parent | fb7e634f3d725728d65e0c32c5d20c99d91a158e (diff) | |
| download | system_core-7f2bb91aecbdc8af268c56f80034d8f3dc0204aa.zip system_core-7f2bb91aecbdc8af268c56f80034d8f3dc0204aa.tar.gz system_core-7f2bb91aecbdc8af268c56f80034d8f3dc0204aa.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_system_core into replicant-6.0
Diffstat (limited to 'adb/adb.cpp')
| -rw-r--r-- | adb/adb.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/adb/adb.cpp b/adb/adb.cpp index 0ff9e3c..9f9e6bd 100644 --- a/adb/adb.cpp +++ b/adb/adb.cpp @@ -919,7 +919,7 @@ int handle_host_request(char *service, transport_type ttype, char* serial, int r if(!strncmp(service,"get-state",strlen("get-state"))) { transport = acquire_one_transport(CS_ANY, ttype, serial, NULL); SendOkay(reply_fd); - SendProtocolString(reply_fd, transport->connection_state_name()); + SendProtocolString(reply_fd, transport ? transport->connection_state_name() : "unknown"); return 0; } #endif // ADB_HOST |