Improve System::long_os_version() on Android

GuillaumeGomez · Dec 13, 2024 · 8c8874b · 8c8874b
1 parent ddd4dc0
commit 8c8874b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/common/system.rs b/src/common/system.rs
@@ -736,7 +736,7 @@ impl System {
     /// | example platform | value of `System::long_os_version()` |
     /// |---|---|
     /// | linux laptop | "Linux 24.04 Ubuntu" |
-    /// | android phone | "Android 15 Pixel 9 Pro" |
+    /// | android phone | "Android 15 on Pixel 9 Pro" |
     /// | apple laptop | "macOS 15.1.1 Sequoia" |
     /// | windows server | "Windows Server 2022 Datacenter" |
     ///

diff --git a/src/unix/linux/system.rs b/src/unix/linux/system.rs
@@ -411,9 +411,12 @@ impl SystemInner {
             long_name.push_str(&os_version);
         }
 
-        if let Some(short_name) = Self::name() {
-            long_name.push(' ');
-            long_name.push_str(&short_name);
+        // Android's name() is extracted from the system property "ro.product.model"
+        // which is documented as "The end-user-visible name for the end product."
+        // So this produces a long_os_version like "Android 15 on Pixel 9 Pro".
+        if let Some(product_name) = Self::name() {
+            long_name.push_str(" on ");
+            long_name.push_str(&product_name);
         }
 
         Some(long_name)