From f4c8fa3c567ddc60b5d24ce8994ae311a4ab7b06 Mon Sep 17 00:00:00 2001
From: Pavel Feldman <pavel.feldman@gmail.com>
Date: Mon, 16 Aug 2021 08:13:02 -0700
Subject: [PATCH] fix(android): fix android tests (4) (#8211)

---
 utils/avd_install.sh  | 2 +-
 utils/avd_recreate.sh | 6 +++---
 utils/avd_start.sh    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/utils/avd_install.sh b/utils/avd_install.sh
index c00aec9591..f2d622b4d6 100755
--- a/utils/avd_install.sh
+++ b/utils/avd_install.sh
@@ -23,7 +23,7 @@ echo Installing emulator...
 yes | ${ANDROID_HOME}/tools/bin/sdkmanager --install platform-tools emulator
 
 echo Installing platform SDK...
-yes | ${ANDROID_HOME}/tools/bin/sdkmanager --install "platforms;android-30"
+yes | ${ANDROID_HOME}/tools/bin/sdkmanager --install "platforms;android-31"
 
 echo Starting ADB...
 ${ANDROID_HOME}/platform-tools/adb devices
diff --git a/utils/avd_recreate.sh b/utils/avd_recreate.sh
index bdd99855b2..b7d4ec4ff5 100755
--- a/utils/avd_recreate.sh
+++ b/utils/avd_recreate.sh
@@ -8,7 +8,7 @@ if [[ -z "${ANDROID_HOME}" ]]; then
     export ANDROID_SDK_ROOT=${SDKDIR}
 fi
 
-${ANDROID_HOME}/tools/bin/avdmanager delete avd --name android30 || true
-echo "y" | ${ANDROID_HOME}/tools/bin/sdkmanager --install "system-images;android-30;google_apis;x86"
-echo "no" | ${ANDROID_HOME}/tools/bin/avdmanager create avd --force --name android30 --device "Nexus 5X" --package "system-images;android-30;google_apis;x86"
+${ANDROID_HOME}/tools/bin/avdmanager delete avd --name android31 || true
+echo "y" | ${ANDROID_HOME}/tools/bin/sdkmanager --install "system-images;android-31;google_apis;x86_64"
+echo "no" | ${ANDROID_HOME}/tools/bin/avdmanager create avd --force --name android31 --device "Nexus 5X" --package "system-images;android-31;google_apis;x86_64"
 ${ANDROID_HOME}/emulator/emulator -list-avds
diff --git a/utils/avd_start.sh b/utils/avd_start.sh
index 43ed4142c9..6b617b4a73 100755
--- a/utils/avd_start.sh
+++ b/utils/avd_start.sh
@@ -12,7 +12,7 @@ echo "Killing previous emulators"
 ${ANDROID_HOME}/platform-tools/adb devices | grep emulator | cut -f1 | while read line; do ${ANDROID_HOME}/platform-tools/adb -s $line emu kill; done
 
 echo "Starting emulator"
-nohup ${ANDROID_HOME}/emulator/emulator -avd android30 -no-audio -gpu swiftshader &
+nohup ${ANDROID_HOME}/emulator/emulator -avd android31 -no-audio -no-window -gpu swiftshader &
 ${ANDROID_HOME}/platform-tools/adb wait-for-device shell 'while [[ -z $(getprop sys.boot_completed | tr -d '\r') ]]; do sleep 1; done; input keyevent 82'
 ${ANDROID_HOME}/platform-tools/adb devices
 echo "Emulator started"
\ No newline at end of file