Skip to content

Add ability to start/restart adb server with custom command #544

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
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add ability to start/restart adb server with custom command #544

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f8cdb8
feat(monitor): ability to start/restart adb server with custom command
Jul 30, 2024
bc23cae
fix: style
Jul 30, 2024
f3eda21
fix: style
Jul 30, 2024
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
30 changes: 26 additions & 4 deletions relay-rust/src/adb_monitor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,23 @@ use std::time::Duration;

const TAG: &str = "AdbMonitor";

#[inline]
fn get_adb_path() -> String {
return std::env::var_os("ADB")
.unwrap_or("adb".into())
.into_string()
.expect("invalid ADB value");
}

#[inline]
fn get_adb_server_command() -> String {
if let Some(env_abd_server_cmd) = std::env::var_os("ADB_SERVER_COMMAND") {
env_abd_server_cmd.into_string().expect("invalid ADB value")
} else {
"start-server".to_string()
}
}

pub trait AdbMonitorCallback {
fn on_new_device_connected(&self, serial: &str);
}
Expand Down Expand Up @@ -207,10 +224,15 @@ impl AdbMonitor {

fn start_adb_daemon() -> bool {
info!(target: TAG, "Restarting adb daemon");
match process::Command::new("adb")
.args(&["start-server"])
.status()
{

let args: Vec<String> = get_adb_server_command()
.split_whitespace()
.map(|s| s.to_string())
.collect();

debug!(target: TAG, "Adb daemon command: {:?}", args);

match process::Command::new(get_adb_path()).args(&args).status() {
Ok(exit_status) => {
if exit_status.success() {
true
Expand Down