Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae868a40 authored by Joe Onorato's avatar Joe Onorato
Browse files

Allow adb to listen both on usb and tcp.

Change-Id: I98db594241631fa17e39686727392afc8b3124bc
parent 7ca9e279
Loading
Loading
Loading
Loading
+15 −10
Original line number Original line Diff line number Diff line
@@ -940,24 +940,29 @@ int adb_main(int is_daemon, int server_port)
        }
        }
    }
    }


        /* for the device, start the usb transport if the
    int usb = 0;
        ** android usb device exists and the "service.adb.tcp.port" and
    if (access("/dev/android_adb", F_OK) == 0) {
        ** "persist.adb.tcp.port" properties are not set.
        // listen on USB
        ** Otherwise start the network transport.
        usb_init();
        */
        usb = 1;
    }

    // If one of these properties is set, also listen on that port
    // If one of the properties isn't set and we couldn't listen on usb,
    // listen on the default port.
    property_get("service.adb.tcp.port", value, "");
    property_get("service.adb.tcp.port", value, "");
    if (!value[0])
    if (!value[0]) {
        property_get("persist.adb.tcp.port", value, "");
        property_get("persist.adb.tcp.port", value, "");
    }
    if (sscanf(value, "%d", &port) == 1 && port > 0) {
    if (sscanf(value, "%d", &port) == 1 && port > 0) {
        printf("using port=%d\n", port);
        // listen on TCP port specified by service.adb.tcp.port property
        // listen on TCP port specified by service.adb.tcp.port property
        local_init(port);
        local_init(port);
    } else if (access("/dev/android_adb", F_OK) == 0) {
    } else if (!usb) {
        // listen on USB
        usb_init();
    } else {
        // listen on default port
        // listen on default port
        local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
        local_init(DEFAULT_ADB_LOCAL_TRANSPORT_PORT);
    }
    }

    D("adb_main(): pre init_jdwp()\n");
    D("adb_main(): pre init_jdwp()\n");
    init_jdwp();
    init_jdwp();
    D("adb_main(): post init_jdwp()\n");
    D("adb_main(): post init_jdwp()\n");