Improves detection for Android TV and Sony models

DeviceDetector.php

@@ -1029,7 +1029,7 @@ protected function parseDevice(): void
         /**
          * All devices that contain Andr0id in string are assumed to be a tv
          */
-        if ($this->matchUserAgent('Andr0id|Android TV|\(lite\) TV')) {
+        if ($this->matchUserAgent('Andr0id|Android TV|\(lite\) TV|BRAVIA')) {
             $this->device = AbstractDeviceParser::DEVICE_TYPE_TV;
         }
 

Tests/Parser/fixtures/oss.yml

@@ -3902,3 +3902,11 @@
     version: "12.3"
     platform: x64
     family: Mac
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 11; BRAVIA VU31 Build/RTK2.220814.001)
+  os:
+    name: Android TV
+    short_name: ADR
+    version: "11"
+    platform:
+    family: Android

Tests/fixtures/tv-1.yml

@@ -5514,7 +5514,7 @@
 -
   user_agent: Mozilla/5.0 (Linux; Android 9.0; BRAVIA 4K UR3 Build/PTT1.190515.001.S97) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.95 Mobile Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: "9.0"
     platform: ""
   client:
@@ -5730,7 +5730,7 @@
 -
   user_agent: Dalvik/2.1.0 (Linux; U; Android 10; BRAVIA VH1 Build/QTG3.200305.006.S89)
   os:
-    name: Android
+    name: Android TV
     version: "10"
     platform: ""
   client:
@@ -5748,7 +5748,7 @@
 -
   user_agent: Dalvik/2.1.0 (Linux; U; Android 9; BRAVIA 4K UR1 Build/PTT1.190515.001.S104)
   os:
-    name: Android
+    name: Android TV
     version: "9"
     platform: ""
   client:
@@ -5766,7 +5766,7 @@
 -
   user_agent: Dalvik/2.1.0 (Linux; U; Android 10; BRAVIA 4K VH2 Build/QTG3.200305.006.S118)
   os:
-    name: Android
+    name: Android TV
     version: "10"
     platform: ""
   client:
@@ -5784,7 +5784,7 @@
 -
   user_agent: Dalvik/2.1.0 (Linux; U; Android 11; BRAVIA VU1 Build/RTT7.210105.001)
   os:
-    name: Android
+    name: Android TV
     version: "11"
     platform: ""
   client:
@@ -6090,7 +6090,7 @@
 -
   user_agent: Dalvik/2.1.0 (Linux; U; Android 9; BRAVIA 8K UR3 Build/PTT1.190515.001.S104)
   os:
-    name: Android
+    name: Android TV
     version: "9"
     platform: ""
   client:
@@ -10285,3 +10285,39 @@
     model: ULX-43UTCS347
   os_family: Android
   browser_family: Chrome
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 11; BRAVIA VU31 Build/RTK2.220814.001)
+  os:
+    name: Android TV
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sony
+    model: Bravia VU31
+  os_family: Android
+  browser_family: Android Browser
+-
+  user_agent: Dalvik/2.1.0 (Linux; U; Android 11; BRAVIA VU2 Build/RTT7.210923.001)
+  os:
+    name: Android TV
+    version: "11"
+    platform: ""
+  client:
+    type: browser
+    name: Android Browser
+    version: ""
+    engine: WebKit
+    engine_version: ""
+  device:
+    type: tv
+    brand: Sony
+    model: Bravia VU2
+  os_family: Android
+  browser_family: Android Browser

Tests/fixtures/tv.yml

@@ -4763,7 +4763,7 @@
 -
   user_agent: Mozilla/5.0 (Linux; Android 7.0; BRAVIA 2015 Build/NRD91N.S34; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/71.0.3578.99 Mobile Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: "7.0"
     platform: ""
   client:
@@ -4781,7 +4781,7 @@
 -
   user_agent: TV Bro/1.0 Mozilla/5.0 (Linux; Android 8.0.0; BRAVIA 2K GB ATV3 Build/OPR2.170623.027.S30; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/79.0.3945.93 Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: 8.0.0
     platform: ""
   client:
@@ -4799,7 +4799,7 @@
 -
   user_agent: Mozilla/5.0 (Linux; Android 7.0; BRAVIA 4K 2015 Build/NRD91N.S34) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: "7.0"
     platform: ""
   client:
@@ -4817,7 +4817,7 @@
 -
   user_agent: TV Bro/1.0 Mozilla/5.0 (Linux; Android 7.0; BRAVIA 4K GB Build/NRD91N.S139; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/77.0.3865.92 Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: "7.0"
     platform: ""
   client:
@@ -4835,7 +4835,7 @@
 -
   user_agent: Mozilla/5.0 (Linux; Android 7.0; BRAVIA 4K GB ATV3) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Mobile Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: "7.0"
     platform: ""
   client:
@@ -4853,7 +4853,7 @@
 -
   user_agent: Mozilla/5.0 (Linux; Android 8.0.0; BRAVIA 4K UR2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.96 Mobile Safari/537.36
   os:
-    name: Android
+    name: Android TV
     version: 8.0.0
     platform: ""
   client:

regexes/device/mobiles.yml

@@ -7737,7 +7737,7 @@ Sony:
       device: 'wearable'
 
     # SONY: Bravia or TV Box
-    - regex: '(?:BRAVIA )(2K GB ATV3|[48]K UR[123]|4K GB ATV3|4K GB|4K VH2|4K 2015|2015|VH1|VU1)(?:[);/ ]|$)'
+    - regex: '(?:BRAVIA )(2K GB ATV3|[48]K UR[123]|4K GB ATV3|4K GB|4K VH2|4K 2015|2015|VH1|VU[12]|VU31)(?:[);/ ]|$)'
       model: 'Bravia $1'
       device: 'tv'
     - regex: 'SVP-DTV15(?:[);/ ]|$)'

regexes/oss.yml

@@ -277,7 +277,7 @@
   name: 'Android TV'
   version: '$1'
 
-- regex: 'Android[; ](\d+[\.\d]*).+(?:(?:Android|AT&T) TV|AOSP on r33a0)'
+- regex: 'Android[; ](\d+[\.\d]*).+(?:(?:Android|AT&T) TV|AOSP on r33a0|BRAVIA)'
   name: 'Android TV'
   version: '$1'