commit 8c60e9dcf72e7360d524836e55a5cbf965f4581a
author Elliott Hughes <enh@google.com> Wed Jul 22 00:25:41 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 22 00:25:41 2015 +0000
tree 0696f9af0f06fa5287744f7e574737b2885a8079
parent 8541587e615e39e86c21e7d24a5bd7b06a95653f
parent e739779d476787d7b2fd11ddd8fa5fdbda830c7b

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