Android: Let WiimoteEmu know whether we have accelerometer/gyroscope

2 files changed, 7 insertions, 0 deletions

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
index 5bb6a92b23..60b07902c3 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/NativeLibrary.java
@@ -265,6 +265,9 @@ public final class NativeLibrary
     Rumble.checkRumble(padID, state);
   }
 
+  public static native void SetMotionSensorsEnabled(boolean accelerometerEnabled,
+          boolean gyroscopeEnabled);
+
   public static native void NewGameIniFile();
 
   public static native void LoadGameIniFile(String gameId);
diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/MotionListener.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/MotionListener.java
index e0d8d68b98..4230b0b7bc 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/MotionListener.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/utils/MotionListener.java
@@ -101,10 +101,14 @@ public class MotionListener implements SensorEventListener
       mSensorManager.registerListener(this, mAccelSensor, SAMPLING_PERIOD_US);
     if (mGyroSensor != null)
       mSensorManager.registerListener(this, mGyroSensor, SAMPLING_PERIOD_US);
+
+    NativeLibrary.SetMotionSensorsEnabled(mAccelSensor != null, mGyroSensor != null);
   }
 
   public void disable()
   {
     mSensorManager.unregisterListener(this);
+
+    NativeLibrary.SetMotionSensorsEnabled(false, false);
   }
 }