Merge pull request #8991 from JosJuice/android-rumble-without-touchscreen

Android: Remove touchscreen check for rumble

2 files changed, 2 insertions, 9 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
index bd57471896..decef06b8f 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
@@ -1177,11 +1177,6 @@ public final class EmulationActivity extends AppCompatActivity
             .commit();
   }
 
-  public boolean deviceHasTouchScreen()
-  {
-    return mDeviceHasTouchScreen;
-  }
-
   public String getSelectedTitle()
   {
     return mSelectedTitle;
@@ -1204,7 +1199,7 @@ public final class EmulationActivity extends AppCompatActivity
 
   public void initInputPointer()
   {
-    if (deviceHasTouchScreen())
+    if (mDeviceHasTouchScreen)
       mEmulationFragment.initInputPointer();
   }
 }
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java
index 79d2fa9347..aa37a318ef 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/Rumble.java
@@ -22,9 +22,7 @@ public class Rumble
   {
     clear();
 
-    if (activity.deviceHasTouchScreen() &&
-            PreferenceManager.getDefaultSharedPreferences(activity)
-                    .getBoolean("phoneRumble", true))
+    if (PreferenceManager.getDefaultSharedPreferences(activity).getBoolean("phoneRumble", true))
     {
       setPhoneVibrator(true, activity);
     }