We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch

patch_bug_3191_haptic_android_vibrator_service.diff (text/plain), 3.65 KB, created by Sylvain on 2017-08-14 08:55:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sylvain

Created: 2017-08-14 08:55:23 UTC

Size: 3.65 KB

patch

obsolete

>diff -r 42b62c737891 android-project/src/org/libsdl/app/SDLActivity.java
>--- a/android-project/src/org/libsdl/app/SDLActivity.java	Sun Aug 13 22:50:23 2017 -0700
>+++ b/android-project/src/org/libsdl/app/SDLActivity.java	Mon Aug 14 10:49:54 2017 +0200
>@@ -593,23 +593,6 @@
>        return false;
>     }
> 
>-
>-
>-    /**
>-     * This method is called by SDL using JNI.
>-     */
>-    public static int openURL(String url)
>-    {
>-       try {
>-          Intent i = new Intent(Intent.ACTION_VIEW);
>-          i.setData(Uri.parse(url));
>-          mSingleton.startActivity(i);
>-       } catch (Exception ex) {
>-          return -1;
>-       }
>-       return 0;
>-    }
>-
>     /**
>      * This method is called by SDL using JNI.
>      */
>@@ -892,6 +875,24 @@
>         }
>     }
> 
>+    /**
>+     * This method is called by SDL using JNI.
>+     */
>+    public static void pollHapticDevices() {
>+        if (SDLActivity.mSDLThread != null) {
>+            mHapticHandler.pollHapticDevices();
>+        }
>+    }
>+
>+    /**
>+     * This method is called by SDL using JNI.
>+     */
>+    public static void hapticRun(int device_id, int length) {
>+        if (SDLActivity.mSDLThread != null) {
>+            mHapticHandler.run(device_id, length);
>+        }
>+    }
>+
>     // Check if a given device is considered a possible SDL joystick
>     public static boolean isDeviceSDLJoystick(int deviceId) {
>         InputDevice device = InputDevice.getDevice(deviceId);
>@@ -1808,18 +1809,6 @@
>         return null;
>     }
> 
>-    public static void pollHapticDevices() {
>-        if (SDLActivity.mSDLThread != null) {
>-            mHapticHandler.pollHapticDevices();
>-        }
>-    }
>-
>-    public static void hapticRun(int device_id, int length) {
>-        if (SDLActivity.mSDLThread != null) {
>-            mHapticHandler.run(device_id, length);
>-        }
>-    }
>-
>     @Override
>     public boolean handleMotionEvent(MotionEvent event) {
>         if ((event.getSource() & InputDevice.SOURCE_JOYSTICK) != 0) {
>@@ -1918,6 +1907,10 @@
>     }
> 
>     public void pollHapticDevices() {
>+        
>+        final int deviceId_VIBRATOR_SERVICE = 999999;
>+        boolean hasVibrator = false;
>+
>         int[] deviceIds = InputDevice.getDeviceIds();
>         // It helps processing the device ids in reverse order
>         // For example, in the case of the XBox 360 wireless dongle,
>@@ -1940,6 +1933,23 @@
>             }
>         }
> 
>+        /* Check VIBRATOR_SERVICE */
>+        {
>+           Vibrator vib = (Vibrator) SDLActivity.mSingleton.getContext().getSystemService(Context.VIBRATOR_SERVICE);
>+           if (vib != null && vib.hasVibrator()) {
>+              hasVibrator = true;
>+              SDLHaptic haptic = getHaptic(deviceId_VIBRATOR_SERVICE);
>+              if (haptic == null) {
>+                 haptic = new SDLHaptic();
>+                 haptic.device_id = deviceId_VIBRATOR_SERVICE;
>+                 haptic.name = "VIBRATOR_SERVICE";
>+                 haptic.vib = vib; 
>+                 mHaptics.add(haptic);
>+                 SDLActivity.nativeAddHaptic(haptic.device_id, haptic.name);
>+              }
>+           }
>+        }
>+
>         /* Check removed devices */
>         ArrayList<Integer> removedDevices = new ArrayList<Integer>();
>         for(int i=0; i < mHaptics.size(); i++) {
>@@ -1948,7 +1958,10 @@
>             for (j=0; j < deviceIds.length; j++) {
>                 if (device_id == deviceIds[j]) break;
>             }
>-            if (j == deviceIds.length) {
>+
>+            if (device_id == deviceId_VIBRATOR_SERVICE && hasVibrator) {
>+               // don't remove the vibrator if it is still present
>+            } else if (j == deviceIds.length) {
>                 removedDevices.add(device_id);
>             }
>         }

Actions: View | Diff

Attachments on bug 3191: 2327 | 2444 | 2445 | 2832 | 2845

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.