From 78cb1c29141cd6925a08f3ff88885312c83b7a87 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Wed, 11 Jul 2018 09:40:23 +0200
Subject: [PATCH] Android: Remove controller-specific code that isn't needed
 anymore

---
 .../utils/ControllerMappingHelper.java        | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
index 69edc7a448..b44fa8cbe4 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/ControllerMappingHelper.java
@@ -39,19 +39,6 @@ public class ControllerMappingHelper
 			{
 				return (value + 1) / 2.0f;
 			}
-			if (axis == MotionEvent.AXIS_GENERIC_1)
-			{
-				// This axis is stuck at ~.5. Ignore it.
-				return 0.0f;
-			}
-		}
-		else if (isMogaPro2Hid(inputDevice))
-		{
-			// This controller has a broken axis that reports a constant value. Ignore it.
-			if (axis == MotionEvent.AXIS_GENERIC_1)
-			{
-				return 0.0f;
-			}
 		}
 		return value;
 	}
@@ -67,10 +54,4 @@ public class ControllerMappingHelper
 		// Microsoft Xbox One controller
 		return inputDevice.getVendorId() == 0x45e && inputDevice.getProductId() == 0x2e0;
 	}
-
-	private boolean isMogaPro2Hid(InputDevice inputDevice)
-	{
-		// Moga Pro 2 HID
-		return inputDevice.getVendorId() == 0x20d6 && inputDevice.getProductId() == 0x6271;
-	}
 }