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

Commit f3c8a9d6 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adbd: allow port configuration on host." am: 2fd9d735 

am: 44668cda

Change-Id: I5ba08f00180ba81033a7d1388e7e2247c7246237
parents 0dcbb75f 44668cda

adb/daemon/main.cpp

+6 −0
Original line number Diff line number Diff line
@@ -248,6 +248,12 @@ int adbd_main(int server_port) { 
        prop_port = android::base::GetProperty("persist.adb.tcp.port", "");

    }



#if !defined(__ANDROID__)

    if (prop_port.empty() && getenv("ADBD_PORT")) {

        prop_port = getenv("ADBD_PORT");

    }

#endif



    int port;

    if (sscanf(prop_port.c_str(), "%d", &port) == 1 && port > 0) {

        D("using port=%d", port);