commit dc812b68f62c2551585457b14f64def73b9eb5fb
author Josh Gao <jmgao@google.com> Mon Aug 14 18:57:54 2017 -0700
committer Josh Gao <jmgao@google.com> Mon Aug 21 14:15:07 2017 -0700
tree 23b3bfd0430717be2880a7e499d025ca476ebd1f
parent 5fa43b0b5dc316fe091c80f585d7684ee0122471

adb: add track-devices-l service.

Add a way to get the full `devices -l` output on a continuous basis.

Test: manual
Change-Id: I2270cc0a0d7e1384ce19631724ddf2462d963ade

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index cc840b8..dbf71d3 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -441,7 +441,9 @@
 #if ADB_HOST
 asocket* host_service_to_socket(const char* name, const char* serial, TransportId transport_id) {
     if (!strcmp(name,"track-devices")) {
-        return create_device_tracker();
+        return create_device_tracker(false);
+    } else if (!strcmp(name, "track-devices-l")) {
+        return create_device_tracker(true);
     } else if (android::base::StartsWith(name, "wait-for-")) {
         name += strlen("wait-for-");
 

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index 91d708f..b2e03a0 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -329,7 +329,8 @@
  */
 struct device_tracker {
     asocket socket;
-    int update_needed;
+    bool update_needed;
+    bool long_output;
     device_tracker* next;
 };
 
@@ -386,15 +387,15 @@
 
     // We want to send the device list when the tracker connects
     // for the first time, even if no update occurred.
-    if (tracker->update_needed > 0) {
-        tracker->update_needed = 0;
+    if (tracker->update_needed) {
+        tracker->update_needed = false;
 
-        std::string transports = list_transports(false);
+        std::string transports = list_transports(tracker->long_output);
         device_tracker_send(tracker, transports);
     }
 }
 
-asocket* create_device_tracker(void) {
+asocket* create_device_tracker(bool long_output) {
     device_tracker* tracker = reinterpret_cast<device_tracker*>(calloc(1, sizeof(*tracker)));
     if (tracker == nullptr) fatal("cannot allocate device tracker");
 
@@ -403,7 +404,8 @@
     tracker->socket.enqueue = device_tracker_enqueue;
     tracker->socket.ready = device_tracker_ready;
     tracker->socket.close = device_tracker_close;
-    tracker->update_needed = 1;
+    tracker->update_needed = true;
+    tracker->long_output = long_output;
 
     tracker->next = device_tracker_list;
     device_tracker_list = tracker;

adb/transport.h

diff --git a/adb/transport.h b/adb/transport.h
index 238e959..00fad56 100644
--- a/adb/transport.h
+++ b/adb/transport.h
@@ -233,6 +233,6 @@
 
 void send_packet(apacket* p, atransport* t);
 
-asocket* create_device_tracker(void);
+asocket* create_device_tracker(bool long_output);
 
 #endif   /* __TRANSPORT_H */