encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed UnsatisfiedLinkError when initializing the HIDDeviceManager in some cases

This commit is contained in:
Sam Lantinga 2018-10-01 14:52:28 -07:00
parent 6e35e42145
commit 679d355317
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
View File

@ -80,6 +80,14 @@ public class HIDDeviceManager {
public HIDDeviceManager(Context context) { public HIDDeviceManager(Context context) {
mContext = context; mContext = context;
// Make sure we have the HIDAPI library loaded with the native functions
try {
System.loadLibrary("hidapi");
} catch (Exception e) {
Log.w(TAG, "Couldn't load hidapi: " + e.toString());
return;
}
HIDDeviceRegisterCallback(this); HIDDeviceRegisterCallback(this);
mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE); mSharedPreferences = mContext.getSharedPreferences("hidapi", Context.MODE_PRIVATE);
@ -180,7 +188,11 @@ public class HIDDeviceManager {
} }
protected void shutdownUSB() { protected void shutdownUSB() {
mContext.unregisterReceiver(mUsbBroadcast); try {
mContext.unregisterReceiver(mUsbBroadcast);
} catch (Exception e) {
// We may not have registered, that's okay
}
} }
protected boolean isHIDDeviceUSB(UsbDevice usbDevice) { protected boolean isHIDDeviceUSB(UsbDevice usbDevice) {