diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-21 09:11:15 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-04-21 09:11:15 -0700 |
| commit | 775a8df614d364fcb82e280069a3f533381240b4 (patch) | |
| tree | 03c0b0d9df1c3f52212196a8d980b58d4636353f | |
| parent | 3523412f43ec616775a73f5fb8a2615370a1ee3a (diff) | |
| parent | 05f202a94bd7c51db10f041bde6006b4e719929e (diff) | |
| download | system_core-775a8df614d364fcb82e280069a3f533381240b4.tar.gz system_core-775a8df614d364fcb82e280069a3f533381240b4.tar.bz2 system_core-775a8df614d364fcb82e280069a3f533381240b4.zip | |
merge from open-source master
Change-Id: I686f28fcfcff1cca7cf254de9e4334cc4ea2fef7
| -rw-r--r-- | adb/adb.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -920,10 +920,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); |