commit c239e53f12dde4ff7d3c60461e903b85bc5ee610
author The Android Open Source Project <initial-contribution@android.com> Wed Apr 21 09:21:10 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 21 09:21:10 2010 -0700
tree 74d0a2d9f1eff202882d2857fc94b496ee81873e
parent 7cd914e223ef7a358b952f64ae1d6209f3eeb365
parent 9819bdb34e120496d89fbda76119be67ff86b8d3

am 9819bdb3: am 775a8df6: merge from open-source master

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index 2436387..1584dbe 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -914,10 +914,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);