From ed303208b3750ac9662894fbeb5d655ae21b3f9c Mon Sep 17 00:00:00 2001
From: Max Schmitt <max@schmitt.mx>
Date: Fri, 6 Sep 2024 14:27:56 +0200
Subject: [PATCH] test: update to android-35 SDK (Android 15) (#32430)

---
 tests/android/webview.spec.ts             | 4 ++++
 tests/page/page-request-intercept.spec.ts | 3 ++-
 utils/avd_install.sh                      | 2 +-
 utils/avd_recreate.sh                     | 6 +++---
 utils/avd_start.sh                        | 6 +++---
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/android/webview.spec.ts b/tests/android/webview.spec.ts
index 46e0e385a0..ca7a114bb1 100644
--- a/tests/android/webview.spec.ts
+++ b/tests/android/webview.spec.ts
@@ -16,6 +16,10 @@
 
 import { androidTest as test, expect } from './androidTest';
 
+test.beforeEach(async ({ androidDevice }) => {
+  await androidDevice.shell('am force-stop com.google.android.googlequicksearchbox');
+});
+
 test.afterEach(async ({ androidDevice }) => {
   await androidDevice.shell('am force-stop org.chromium.webview_shell');
   await androidDevice.shell('am force-stop com.android.chrome');
diff --git a/tests/page/page-request-intercept.spec.ts b/tests/page/page-request-intercept.spec.ts
index 33516606e7..eb9baae47e 100644
--- a/tests/page/page-request-intercept.spec.ts
+++ b/tests/page/page-request-intercept.spec.ts
@@ -284,8 +284,9 @@ it('should fulfill popup main request using alias', async ({ page, server, isEle
 
 it('request.postData is not null when fetching FormData with a Blob', {
   annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/24077' }
-}, async ({ server, page, browserName, isElectron, electronMajorVersion }) => {
+}, async ({ server, page, browserName, isElectron, electronMajorVersion, isAndroid }) => {
   it.skip(isElectron && electronMajorVersion < 31);
+  it.fixme(isAndroid, 'postData is null for some reason');
   it.fixme(browserName === 'webkit', 'The body is empty in WebKit when intercepting');
   await page.goto(server.EMPTY_PAGE);
   await page.setContent(`
diff --git a/utils/avd_install.sh b/utils/avd_install.sh
index 6beb8bf43f..a0586d6936 100755
--- a/utils/avd_install.sh
+++ b/utils/avd_install.sh
@@ -24,7 +24,7 @@ echo Installing emulator...
 yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install platform-tools emulator
 
 echo Installing platform SDK...
-yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-33"
+yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "platforms;android-35"
 
 echo Starting ADB...
 ${ANDROID_HOME}/platform-tools/adb devices
diff --git a/utils/avd_recreate.sh b/utils/avd_recreate.sh
index 0877e76ed1..81c3484907 100755
--- a/utils/avd_recreate.sh
+++ b/utils/avd_recreate.sh
@@ -13,7 +13,7 @@ if [[ "$(uname -m)" == "arm64" ]]; then
     ANDROID_ARCH="arm64-v8a"
 fi
 
-${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android33 || true
-yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-33;google_apis;$ANDROID_ARCH" platform-tools emulator
-echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android33 --device "Nexus 5X" --package "system-images;android-33;google_apis;$ANDROID_ARCH"
+${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager delete avd --name android35 || true
+yes | ${ANDROID_HOME}/cmdline-tools/latest/bin/sdkmanager --install "system-images;android-35;google_apis;$ANDROID_ARCH" platform-tools emulator
+echo "no" | ${ANDROID_HOME}/cmdline-tools/latest/bin/avdmanager create avd --force --name android35 --device "Nexus 5X" --package "system-images;android-35;google_apis;$ANDROID_ARCH"
 ${ANDROID_HOME}/emulator/emulator -list-avds
diff --git a/utils/avd_start.sh b/utils/avd_start.sh
index 67acb1c63e..1c3bc53418 100755
--- a/utils/avd_start.sh
+++ b/utils/avd_start.sh
@@ -9,15 +9,15 @@ fi
 bash $PWD/utils/avd_stop.sh
 
 echo "Starting emulator"
-# nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -gpu swiftshader &
-nohup ${ANDROID_HOME}/emulator/emulator -avd android33 -no-audio -no-window -no-boot-anim -no-snapshot &
+# nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -gpu swiftshader &
+nohup ${ANDROID_HOME}/emulator/emulator -avd android35 -no-audio -no-window -no-boot-anim -no-snapshot &
 ${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"
 
 echo "Installing Chromium WebView"
 # See here for the latest revision: https://storage.googleapis.com/chromium-browser-snapshots/Android/LAST_CHANGE
-CHROMIUM_ANDROID_REVISION="1190572"
+CHROMIUM_ANDROID_REVISION="1340145"
 WEBVIEW_TMP_DIR="$(mktemp -d)"
 WEBVIEW_TMP_FILE="$WEBVIEW_TMP_DIR/chrome-android-zip"
 curl -s -o "${WEBVIEW_TMP_FILE}" "https://storage.googleapis.com/chromium-browser-snapshots/Android/${CHROMIUM_ANDROID_REVISION}/chrome-android.zip"