From 0905b054e0d6975f1b385d108d5f9db339e2fb1e Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Sun, 5 Apr 2026 15:21:38 +0100
Subject: [PATCH 1/2] Move androidDeviceTest to androidTest

Rename the source directory for Android device tests to the standard `androidTest` location.
---
 android-test/src/{androidDeviceTest => androidTest}/README.md     | 0
 .../java/okhttp/android/test/OkHttpTest.kt                        | 0
 .../java/okhttp/android/test/SingleAndroidTest.kt                 | 0
 .../java/okhttp/android/test/StrictModeTest.kt                    | 0
 .../java/okhttp/android/test/alpn/AlpnOverrideTest.kt             | 0
 .../java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt | 0
 .../java/okhttp/android/test/sni/SniOverrideTest.kt               | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename android-test/src/{androidDeviceTest => androidTest}/README.md (100%)
 rename android-test/src/{androidDeviceTest => androidTest}/java/okhttp/android/test/OkHttpTest.kt (100%)
 rename android-test/src/{androidDeviceTest => androidTest}/java/okhttp/android/test/SingleAndroidTest.kt (100%)
 rename android-test/src/{androidDeviceTest => androidTest}/java/okhttp/android/test/StrictModeTest.kt (100%)
 rename android-test/src/{androidDeviceTest => androidTest}/java/okhttp/android/test/alpn/AlpnOverrideTest.kt (100%)
 rename android-test/src/{androidDeviceTest => androidTest}/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt (100%)
 rename android-test/src/{androidDeviceTest => androidTest}/java/okhttp/android/test/sni/SniOverrideTest.kt (100%)

diff --git a/android-test/src/androidDeviceTest/README.md b/android-test/src/androidTest/README.md
similarity index 100%
rename from android-test/src/androidDeviceTest/README.md
rename to android-test/src/androidTest/README.md
diff --git a/android-test/src/androidDeviceTest/java/okhttp/android/test/OkHttpTest.kt b/android-test/src/androidTest/java/okhttp/android/test/OkHttpTest.kt
similarity index 100%
rename from android-test/src/androidDeviceTest/java/okhttp/android/test/OkHttpTest.kt
rename to android-test/src/androidTest/java/okhttp/android/test/OkHttpTest.kt
diff --git a/android-test/src/androidDeviceTest/java/okhttp/android/test/SingleAndroidTest.kt b/android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt
similarity index 100%
rename from android-test/src/androidDeviceTest/java/okhttp/android/test/SingleAndroidTest.kt
rename to android-test/src/androidTest/java/okhttp/android/test/SingleAndroidTest.kt
diff --git a/android-test/src/androidDeviceTest/java/okhttp/android/test/StrictModeTest.kt b/android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt
similarity index 100%
rename from android-test/src/androidDeviceTest/java/okhttp/android/test/StrictModeTest.kt
rename to android-test/src/androidTest/java/okhttp/android/test/StrictModeTest.kt
diff --git a/android-test/src/androidDeviceTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt b/android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt
similarity index 100%
rename from android-test/src/androidDeviceTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt
rename to android-test/src/androidTest/java/okhttp/android/test/alpn/AlpnOverrideTest.kt
diff --git a/android-test/src/androidDeviceTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt b/android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt
similarity index 100%
rename from android-test/src/androidDeviceTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt
rename to android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt
diff --git a/android-test/src/androidDeviceTest/java/okhttp/android/test/sni/SniOverrideTest.kt b/android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt
similarity index 100%
rename from android-test/src/androidDeviceTest/java/okhttp/android/test/sni/SniOverrideTest.kt
rename to android-test/src/androidTest/java/okhttp/android/test/sni/SniOverrideTest.kt

From 8255aa01ff16f97dd0fdd9738fd9ef2c0406af7a Mon Sep 17 00:00:00 2001
From: Yuri Schimke <yuri@schimke.ee>
Date: Sun, 5 Apr 2026 15:34:40 +0100
Subject: [PATCH 2/2] skip tests for now

---
 android-test/build.gradle.kts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/android-test/build.gradle.kts b/android-test/build.gradle.kts
index cda68abb74af..10fe81bd7262 100644
--- a/android-test/build.gradle.kts
+++ b/android-test/build.gradle.kts
@@ -1,3 +1,4 @@
+import de.mannodermaus.gradle.plugins.junit5.dsl.UnsupportedDeviceBehavior
 import okhttp3.buildsupport.androidBuild
 
 plugins {
@@ -108,6 +109,7 @@ dependencies {
 }
 
 junitPlatform {
+  instrumentationTests.behaviorForUnsupportedDevices = UnsupportedDeviceBehavior.Skip
   filters {
     excludeTags("Remote")
   }