Permalink
Browse files

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

…ode"
  • Loading branch information...
2 parents 705c944 + 8e2ceae commit 05f202a94bd7c51db10f041bde6006b4e719929e @mikeandroid mikeandroid committed with Android Code Review Apr 20, 2010
Showing with 6 additions and 3 deletions.
  1. +6 −3 adb/adb.c
View
@@ -919,10 +919,13 @@ int adb_main(int is_daemon)
}
/* 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);

0 comments on commit 05f202a

Please sign in to comment.