tor-browser

commit f807aa2cb094a24f3874150396c15fcdeacd7345
parent c4592fa362053fd59e3d307c65ce8cd597640d62
Author: Makoto Kato <m_kato@ga2.so-net.ne.jp>
Date:   Tue, 28 Oct 2025 23:53:10 +0000

Bug 1995105 - Import android_api_to_os_version. r=ci-and-tooling,aryx

This is a regression by bug 1995044. `mozinfo.platforminfo` isn't imported.

We should import `get_android_api_to_os_version` directly instead of
using `mozinfo.platforminfo`.

Also, current emulator runs on Android API 34, so default should be 34.

Differential Revision: https://phabricator.services.mozilla.com/D270312

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

1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/testing/mozharness/mozharness/mozilla/testing/per_test_base.py b/testing/mozharness/mozharness/mozilla/testing/per_test_base.py
@@ -11,6 +11,7 @@ import posixpath
 import sys
 
 import mozinfo
+from mozinfo.platforminfo import android_api_to_os_version
 
 
 class SingleTestMixin:
@@ -345,12 +346,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", 24))}
+                {"android_version": str(self.config.get("android_version", 34))}
             )
             mozinfo.update(
                 {
-                    "os_version": mozinfo.platforminfo.android_api_to_os_version(
-                        self.config.get("android_version", 24)
+                    "os_version": android_api_to_os_version(
+                        self.config.get("android_version", 34)
                     )
                 }
             )