commit 05f202a94bd7c51db10f041bde6006b4e719929e
author Mike Lockwood <lockwood@android.com> Tue Apr 20 11:09:49 2010 -0700
committer Android Code Review <code-review@android.com> Tue Apr 20 11:09:49 2010 -0700
tree e843a866e9becd042ad6f13d04881de898cd460f
parent 705c944c0e2a50150ffb41707b6b3daebb45cf79
parent 8e2ceaeacf9fa1eb5ac41e4d3498836a6e2c7c97

Merge "adb: Add persistent system property for running adb in TCPIP mode"

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 7df3f7b..e762ac6 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -919,10 +919,13 @@
     }
 
         /* for the device, start the usb transport if the
-        ** android usb device exists and "service.adb.tcp"
-        ** is not set, otherwise start the network transport.
+        ** android usb device exists and the "service.adb.tcp.port" and
+        ** "persist.adb.tcp.port" properties are not set.
+        ** Otherwise start the network transport.
         */
-    property_get("service.adb.tcp.port", value, "0");
+    property_get("service.adb.tcp.port", value, "");
+    if (!value[0])
+        property_get("persist.adb.tcp.port", value, "");
     if (sscanf(value, "%d", &port) == 1 && port > 0) {
         // listen on TCP port specified by service.adb.tcp.port property
         local_init(port);