diff options
| author | Jose <jose@zeroc.com> | 2022-07-26 17:27:36 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2022-07-26 17:27:36 +0200 |
| commit | fd6d6d4c4408e34c880e58ec22b3d6664291666b (patch) | |
| tree | 8f031fe5afbd78ed18bdaf0cc26e975ba8ee5ce5 | |
| parent | Update Java Android build instructions (diff) | |
| download | ice-3.7.8-rc2.tar.bz2 ice-3.7.8-rc2.tar.xz ice-3.7.8-rc2.zip | |
Update android test controller emulator checksv3.7.8-rc2
2 files changed, 18 insertions, 16 deletions
diff --git a/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index fcf5a7fe2e0..501e5c94035 100644 --- a/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java-compat/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -175,14 +175,15 @@ public class ControllerApp extends Application public static boolean isEmulator() { - return Build.FINGERPRINT.startsWith("generic") || - Build.FINGERPRINT.startsWith("unknown") || - Build.MODEL.contains("google_sdk") || - Build.MODEL.contains("Emulator") || - Build.MODEL.contains("Android SDK built for x86") || - Build.MANUFACTURER.contains("Genymotion") || - (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) || - Build.PRODUCT.equals("google_sdk"); + return Build.FINGERPRINT.startsWith("google/sdk_gphone") || + Build.FINGERPRINT.startsWith("generic") || + Build.FINGERPRINT.startsWith("unknown") || + Build.MODEL.contains("google_sdk") || + Build.MODEL.contains("Emulator") || + Build.MODEL.contains("Android SDK built for x86") || + Build.MANUFACTURER.contains("Genymotion") || + (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) || + Build.PRODUCT.equals("google_sdk"); } class ControllerI diff --git a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index 524a44e4729..7b96dad7583 100644 --- a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -172,14 +172,15 @@ public class ControllerApp extends Application public static boolean isEmulator() { - return Build.FINGERPRINT.startsWith("generic") || - Build.FINGERPRINT.startsWith("unknown") || - Build.MODEL.contains("google_sdk") || - Build.MODEL.contains("Emulator") || - Build.MODEL.contains("Android SDK built for x86") || - Build.MANUFACTURER.contains("Genymotion") || - (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) || - Build.PRODUCT.equals("google_sdk"); + return Build.FINGERPRINT.startsWith("google/sdk_gphone") || + Build.FINGERPRINT.startsWith("generic") || + Build.FINGERPRINT.startsWith("unknown") || + Build.MODEL.contains("google_sdk") || + Build.MODEL.contains("Emulator") || + Build.MODEL.contains("Android SDK built for x86") || + Build.MANUFACTURER.contains("Genymotion") || + (Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")) || + Build.PRODUCT.equals("google_sdk"); } class ControllerI |