am 32b4d786: am a5d0ca4f: Merge "Show "(reverse)" in "adb reverse --list"."

* commit '32b4d786e14dd14cee39c12f56231ccf56c6710a':
  Show "(reverse)" in "adb reverse --list".
This commit is contained in:
Elliott Hughes 2015-07-22 00:54:03 +00:00 committed by Android Git Automerger
commit b0250ce713

View file

@ -142,8 +142,10 @@ std::string format_listeners() {
continue;
}
// <device-serial> " " <local-name> " " <remote-name> "\n"
// Entries from "adb reverse" have no serial.
android::base::StringAppendF(&result, "%s %s %s\n",
l->transport->serial, l->local_name, l->connect_to);
l->transport->serial ? l->transport->serial : "(reverse)",
l->local_name, l->connect_to);
}
return result;
}