From 7336bf50c8dbd820d57abcea059c61401890fe41 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@unity3d.com>
Date: Mon, 20 Apr 2026 15:55:08 +0300
Subject: [PATCH 1/2] Expand AndroidDeviceCapabilities.vibratorCount

---
 .../Plugins/Android/AndroidGameController.cs      | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs
index 2cf70472dc..465ef6913a 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs
@@ -117,6 +117,7 @@ internal struct AndroidDeviceCapabilities
         public bool isVirtual;
         public AndroidAxis[] motionAxes;
         public AndroidInputSource inputSources;
+        public int vibratorCount;
 
         public string ToJson()
         {
@@ -132,8 +133,18 @@ public static AndroidDeviceCapabilities FromJson(string json)
 
         public override string ToString()
         {
-            return
-                $"deviceDescriptor = {deviceDescriptor}, productId = {productId}, vendorId = {vendorId}, isVirtual = {isVirtual}, motionAxes = {(motionAxes == null ? "<null>" : String.Join(",", motionAxes.Select(i => i.ToString()).ToArray()))}, inputSources = {inputSources}";
+            var entries = new[]
+            {
+                $"deviceDescriptor: {deviceDescriptor}",
+                $"productId: {productId}",
+                $"vendorId: {vendorId}",
+                $"isVirtual: {isVirtual}",
+                $"motionAxes: {(motionAxes == null ? "<null>" : String.Join(",", motionAxes.Select(i => i.ToString()).ToArray()))}",
+                $"inputSources: {inputSources}",
+                $"vibratorCount: {vibratorCount}"
+            };
+
+            return string.Join(", ", entries);
         }
     }
 }

From 06079487cf0ecc225a393275e955270c8d80e2da Mon Sep 17 00:00:00 2001
From: Tomas <tomas@unity3d.com>
Date: Mon, 20 Apr 2026 16:36:50 +0300
Subject: [PATCH 2/2] small fix

---
 .../Plugins/Android/AndroidGameController.cs      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs
index 465ef6913a..8a0d6fd539 100644
--- a/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs
+++ b/Packages/com.unity.inputsystem/InputSystem/Plugins/Android/AndroidGameController.cs
@@ -133,15 +133,16 @@ public static AndroidDeviceCapabilities FromJson(string json)
 
         public override string ToString()
         {
+            var motionAxesString = motionAxes == null ? "<null>" : string.Join(",", motionAxes);
             var entries = new[]
             {
-                $"deviceDescriptor: {deviceDescriptor}",
-                $"productId: {productId}",
-                $"vendorId: {vendorId}",
-                $"isVirtual: {isVirtual}",
-                $"motionAxes: {(motionAxes == null ? "<null>" : String.Join(",", motionAxes.Select(i => i.ToString()).ToArray()))}",
-                $"inputSources: {inputSources}",
-                $"vibratorCount: {vibratorCount}"
+                $"deviceDescriptor = {deviceDescriptor}",
+                $"productId = {productId}",
+                $"vendorId = {vendorId}",
+                $"isVirtual = {isVirtual}",
+                $"motionAxes = {motionAxesString}",
+                $"inputSources = {inputSources}",
+                $"vibratorCount = {vibratorCount}"
             };
 
             return string.Join(", ", entries);