From 6d220f44cabf37c313a19b25c0cc909f1281622d Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 21 Dec 2024 12:45:23 -0800
Subject: [PATCH] Fix ADB issues when testing

---
 scripts/avd_test.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/avd_test.sh b/scripts/avd_test.sh
index 6b0697508..c8765e8eb 100755
--- a/scripts/avd_test.sh
+++ b/scripts/avd_test.sh
@@ -131,6 +131,10 @@ test_main() {
   "$sdk" --channel=3 $avd_pkg
   echo no | "$avd" create avd -f -n test -k $avd_pkg
 
+  # Make sure ADB is behaving correctly
+  adb kill-server
+  adb start-server
+
   # Launch stock emulator
   print_title "* Launching $avd_pkg"
   "$emu" @test $emu_args >/dev/null 2>&1 &