tor-browser

commit 074dc56365f97076f88351985eb54a2d24bf293c
parent be1b3a3eddd64d5637173c38914bdf3bcd5ef285
Author: Alexandru Marc <amarc@mozilla.com>
Date:   Wed, 29 Oct 2025 03:36:57 +0200

Revert "Bug 1995105 - Import android_api_to_os_version. r=ci-and-tooling,aryx" for causing mass failures

This reverts commit f807aa2cb094a24f3874150396c15fcdeacd7345.

Diffstat:
M
testing/mozharness/mozharness/mozilla/testing/per_test_base.py
 | 
7
+++----

1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@@ -11,7 +11,6 @@ import posixpath
 import sys
 
 import mozinfo
-from mozinfo.platforminfo import android_api_to_os_version
 
 
 class SingleTestMixin:
@@ -346,12 +345,12 @@ class SingleTestMixin:
             # extra android mozinfo normally comes from device queries, but this
             # code may run before the device is ready, so rely on configuration
             mozinfo.update(
-                {"android_version": str(self.config.get("android_version", 34))}
+                {"android_version": str(self.config.get("android_version", 24))}
             )
             mozinfo.update(
                 {
-                    "os_version": android_api_to_os_version(
-                        self.config.get("android_version", 34)
+                    "os_version": mozinfo.platforminfo.android_api_to_os_version(
+                        self.config.get("android_version", 24)
                     )
                 }
             )