From fc668ef0c09b5a4663077757b8fe73bc850ff8ea Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Mon, 16 Dec 2024 11:05:24 +0700
Subject: [PATCH] Backport - Improve device detection for Generic device:
 capture its device model instead of its Android version

(cherry picked from commit 6c6ff97e0cdff8930cdd09c51667855a4272c1d9)
---
 src/ua-parser.js      | 2 +-
 test/device-test.json | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index 9c66bcc..8c15801 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -793,7 +793,7 @@
             ], [[TYPE, TABLET]], [
             /(phone|mobile(?:[;\/]| [ \w\/\.]*safari)|pda(?=.+windows ce))/i    // Unidentifiable Mobile
             ], [[TYPE, MOBILE]], [
-            /(android[-\w\. ]{0,9});.+buil/i                                    // Generic Android Device
+            /droid .+?; ([\w\. -]+)( bui|\))/i                                  // Generic Android Device
             ], [MODEL, [VENDOR, 'Generic']]
         ],
 
diff --git a/test/device-test.json b/test/device-test.json
index ae55d45..ad9ef36 100644
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -5944,7 +5944,14 @@
         "ua": "Mozilla/5.0 (Linux; U; Android 6.0.1; i980 Build/MRA58K)",
         "expect": {
             "vendor": "Generic",
-            "model": "Android 6.0.1"
+            "model": "i980"
+        }
+    },{
+        "desc": "Generic Android Device",
+        "ua": "Dalvik/2.1.0 (Linux; U; Android 9; X96mini_RP Build/X96mini_RP)",
+        "expect": {
+            "vendor": "Generic",
+            "model": "X96mini_RP"
         }
     },
     {