commit b0250ce713f79851f2dbbe98caa0a8fcc9ae5616
author Elliott Hughes <enh@google.com> Wed Jul 22 00:54:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jul 22 00:54:03 2015 +0000
tree 23045d66af30e35cb48d24fecf960d56fb22f488
parent 02cb8dc57bb53b185d7482c742df8f42dc7725e9
parent 32b4d786e14dd14cee39c12f56231ccf56c6710a

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

* commit '32b4d786e14dd14cee39c12f56231ccf56c6710a':
  Show "(reverse)" in "adb reverse --list".

adb/adb_listeners.cpp

diff --git a/adb/adb_listeners.cpp b/adb/adb_listeners.cpp
index 641b537..a15c513 100644
--- a/adb/adb_listeners.cpp
+++ b/adb/adb_listeners.cpp
@@ -142,8 +142,10 @@
             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;
 }