Fix AdbRunner AVD detection: use getprop first, skip offline emulators#312
Merged
jonathanpeppers merged 2 commits intomainfrom Mar 19, 2026
Merged
Fix AdbRunner AVD detection: use getprop first, skip offline emulators#312jonathanpeppers merged 2 commits intomainfrom
jonathanpeppers merged 2 commits intomainfrom
Conversation
rmarinho
force-pushed
the
dev/adbrunner-avd-detection
branch
3 times, most recently
from
754bc93 to
994314f
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
Improves Xamarin.Android.Tools.AndroidSdk’s AdbRunner emulator AVD detection to better handle modern emulator behavior and avoid slow/failed AVD queries while emulators are offline (e.g., during boot polling).
Changes:
- Prefer
adb shell getprop ro.boot.qemu.avd_namefor emulator AVD name detection, with fallback toadb emu avd name. - Skip AVD-name probing for offline emulators in
ListDevicesAsync(and optionally log the skip). - Add/extend unit tests covering the detection order and offline-emulator handling.
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 7 comments.
| File | Description |
|---|---|
| tests/Xamarin.Android.Tools.AndroidSdk-Tests/AdbRunnerTests.cs | Adds new tests using a fake adb implementation to validate AVD detection and offline handling. |
| src/Xamarin.Android.Tools.AndroidSdk/Runners/AdbRunner.cs | Updates AVD name query order; skips offline emulators; adds optional logger parameter. |
| src/Xamarin.Android.Tools.AndroidSdk/PublicAPI/netstandard2.0/PublicAPI.Unshipped.txt | Updates public API entry for the AdbRunner constructor signature change. |
| src/Xamarin.Android.Tools.AndroidSdk/PublicAPI/net10.0/PublicAPI.Unshipped.txt | Updates public API entry for the AdbRunner constructor signature change. |
You can also share your feedback on Copilot code review. Take the survey.
Comment on lines
+674
to
+677
| var psi = new System.Diagnostics.ProcessStartInfo ("chmod") { | ||
| ArgumentList = { "+x", path }, | ||
| }; | ||
| System.Diagnostics.Process.Start (psi)?.WaitForExit (); |
Member
There was a problem hiding this comment.
I thought we had a [DllImport] for this somewhere? Can the test call a method from ProcessUtils (or whereever that was?)
Member
Author
There was a problem hiding this comment.
Done — replaced Process.Start("chmod") with FileUtil.Chmod(path, 0x1ED) which uses File.SetUnixFileMode on .NET 7+ and the [DllImport("libc")] chmod on older runtimes. Also replaced the null-forgiving ! on Path.GetDirectoryName() with is { Length: > 0 } property pattern per repo conventions.
rmarinho
force-pushed
the
dev/adbrunner-avd-detection
branch
from
10ec06c to
1661ac9
Compare
Two fixes for AdbRunner emulator detection reliability: 1. Swap AVD name detection order in GetEmulatorAvdNameAsync: use 'adb shell getprop ro.boot.qemu.avd_name' first (reliable on all modern emulators), fall back to 'adb emu avd name' for older versions. The 'emu avd name' command returns empty output on emulator 36.4.10+. 2. Skip AVD name queries for offline emulators in ListDevicesAsync: neither getprop nor 'emu avd name' works on offline devices, causing unnecessary delays during boot polling loops. Context: dotnet/android#10965 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
rmarinho
force-pushed
the
dev/adbrunner-avd-detection
branch
from
1661ac9 to
cc1e063
Compare
…erators
- Replace Process.Start("chmod") with FileUtil.Chmod(path, 0x1ED)
which uses managed File.SetUnixFileMode on .NET 7+ and the
chmod DllImport on older runtimes
- Replace null-forgiving operator on Path.GetDirectoryName() with
is { Length: > 0 } property pattern per repo conventions
- Reorder CleanupFakeAdb to delete file only when dir is non-null
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
jonathanpeppers
approved these changes
Mar 19, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Two fixes for
AdbRunneremulator detection reliability, discovered while investigating dotnet/android#10965.Related PR: dotnet/android#10969
1. Swap AVD name detection order (
GetEmulatorAvdNameAsync)adb -s <serial> emu avd namereturns empty output on modern Android emulators (tested with emulator 36.4.10, adb v36). This causes AVD name matching to fail even when the correct emulator is running.Fix: Use
adb shell getprop ro.boot.qemu.avd_namefirst (reliable on all modern emulators, always set by the emulator kernel), fall back toemu avd namefor older emulator versions.2. Skip AVD name queries for offline emulators (
ListDevicesAsync)ListDevicesAsynccalledGetEmulatorAvdNameAsyncfor ALL emulators including offline ones. Neithergetpropnoremu avd nameworks on offline devices — they fail or timeout. During boot polling loops, this causes unnecessary delays on every iteration as the emulator transitions from offline → online.Fix: Only query AVD names for online emulators (
Status == AdbDeviceStatus.Online).Testing