From da103f71976cd2b7215c594fd218ec942678ad25 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sun, 28 Feb 2021 16:35:17 -0600 Subject: [PATCH] Don't use our built-in Switch Pro mapping on Android 10+ --- .../java/com/limelight/binding/input/ControllerHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java index dd497092..50ecaece 100644 --- a/app/src/main/java/com/limelight/binding/input/ControllerHandler.java +++ b/app/src/main/java/com/limelight/binding/input/ControllerHandler.java @@ -895,7 +895,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD return KeyEvent.KEYCODE_BUTTON_MODE; } - if ((context.vendorId == 0x057e && context.productId == 0x2009) || // Switch Pro controller + // This mapping was adding in Android 10, then changed based on + // kernel changes (adding hid-nintendo) in Android 11. If we're + // on anything newer than Pie, just use the built-in mapping. + if ((context.vendorId == 0x057e && context.productId == 0x2009 && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) || // Switch Pro controller (context.vendorId == 0x0f0d && context.productId == 0x00c1)) { // HORIPAD for Switch switch (event.getScanCode()) { case 0x130: