Skip to content

feat: honour ANDROID_ADB_SERVER_PORT env variable #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rubu wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −2
Open

feat: honour ANDROID_ADB_SERVER_PORT env variable #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions dadb/src/main/kotlin/dadb/adbserver/AdbServer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,13 @@ import java.nio.charset.StandardCharsets

object AdbServer {

/**
* Default adb server port. Mirrors the adb CLI, which honors ANDROID_ADB_SERVER_PORT and
* otherwise falls back to 5037.
*/
@JvmStatic
val DEFAULT_ADB_SERVER_PORT: Int = System.getenv("ANDROID_ADB_SERVER_PORT")?.toIntOrNull() ?: 5037

/**
* Experimental API
*
Expand Down Expand Up @@ -45,7 +52,7 @@ object AdbServer {
@JvmOverloads
fun createDadb(
adbServerHost: String = "localhost",
adbServerPort: Int = 5037,
adbServerPort: Int = DEFAULT_ADB_SERVER_PORT,
deviceQuery: String = "host:transport-any",
connectTimeout: Int = 0,
socketTimeout: Int = 0
Expand All @@ -63,7 +70,7 @@ object AdbServer {
@JvmOverloads
fun listDadbs(
adbServerHost: String = "localhost",
adbServerPort: Int = 5037,
adbServerPort: Int = DEFAULT_ADB_SERVER_PORT,
): List<Dadb> {
if (!AdbBinary.tryStartServer(adbServerHost, adbServerPort)) {
return emptyList()
Expand Down