From a596e01ef20c2591bc2c1b3474dc9b8a2841fd0f Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Sat, 23 May 2026 10:19:44 +0200
Subject: [PATCH] clean up controller detection (#943)

---
 src/ui/android.rs | 25 ++++---------------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/ui/android.rs b/src/ui/android.rs
index 8daf7bd..4da8554 100644
--- a/src/ui/android.rs
+++ b/src/ui/android.rs
@@ -151,9 +151,6 @@ pub fn list_controllers() -> Vec<ControllerInfo> {
 }
 
 fn list_controllers_on_jvm(env: &mut Env<'_>) -> jni::errors::Result<Vec<ControllerInfo>> {
-    let source_gamepad = AndroidInputDevice::SOURCE_GAMEPAD(env)?;
-    let source_joystick = AndroidInputDevice::SOURCE_JOYSTICK(env)?;
-
     let device_ids = AndroidInputDevice::get_device_ids(env)?;
     let count = device_ids.len(env)?;
     let mut ids = vec![0i32; count];
@@ -168,28 +165,14 @@ fn list_controllers_on_jvm(env: &mut Env<'_>) -> jni::errors::Result<Vec<Control
             continue;
         }
 
-        if device.is_virtual(env)? {
-            continue;
-        }
-
-        if !device.is_external(env)? {
-            continue;
-        }
-
-        let supports_gamepad = device.supports_source(env, source_gamepad)?;
-        let supports_joystick = device.supports_source(env, source_joystick)?;
+        let supports_gamepad =
+            device.supports_source(env, AndroidInputDevice::SOURCE_GAMEPAD(env)?)?;
+        let supports_joystick =
+            device.supports_source(env, AndroidInputDevice::SOURCE_JOYSTICK(env)?)?;
         if !supports_gamepad && !supports_joystick {
             continue;
         }
 
-        if device.get_vendor_id(env)? == 0 {
-            continue;
-        }
-
-        if device.get_product_id(env)? == 0 {
-            continue;
-        }
-
         let name = if let Ok(name) = device.get_name(env)
             && let Ok(name) = name.try_to_string(env)
         {