diff --git a/project/javaSDL2/HIDDeviceManager.java b/project/javaSDL2/HIDDeviceManager.java index 56f677e66..6b0e9d4f3 100644 --- a/project/javaSDL2/HIDDeviceManager.java +++ b/project/javaSDL2/HIDDeviceManager.java @@ -359,6 +359,22 @@ public class HIDDeviceManager { HIDDeviceUSB device = new HIDDeviceUSB(this, usbDevice, interface_index); int id = device.getId(); mDevicesById.put(id, device); + + if (usbDevice != null && !mUsbManager.hasPermission(usbDevice)) + { + HIDDeviceOpenPending(id); + try + { + mUsbManager.requestPermission(usbDevice, PendingIntent.getBroadcast(mContext, 0$ + } + catch (Exception e) + { + Log.v(TAG, "Couldn't request permission for USB device " + usbDevice); + HIDDeviceOpenResult(id, false); + return; + } + } + HIDDeviceConnected(id, device.getIdentifier(), device.getVendorId(), device.getProductId(), device.getSerialNumber(), device.getVersion(), device.getManufacturerName(), device.getProductName(), usbInterface.getId(), usbInterface.getInterfaceClass(), usbInterface.getInterfaceSubclass(), usbInterface.getInterfaceProtocol()); } } diff --git a/project/jni/application/commandergenius/AndroidAppSettings.cfg b/project/jni/application/commandergenius/AndroidAppSettings.cfg index f3292fb3e..251e6cb89 100644 --- a/project/jni/application/commandergenius/AndroidAppSettings.cfg +++ b/project/jni/application/commandergenius/AndroidAppSettings.cfg @@ -7,7 +7,7 @@ AppName="Commander Genius" AppFullName=net.sourceforge.clonekeenplus # Application version code (integer) -AppVersionCode=255000 +AppVersionCode=255002 # Application user-visible version name (string) AppVersionName="2.5.5 Release" diff --git a/project/jni/application/commandergenius/commandergenius b/project/jni/application/commandergenius/commandergenius index 970b58b14..6f50579d9 160000 --- a/project/jni/application/commandergenius/commandergenius +++ b/project/jni/application/commandergenius/commandergenius @@ -1 +1 @@ -Subproject commit 970b58b14c42863d6e69f79d064ac36576e4868a +Subproject commit 6f50579d92949cd1879235008c6f466c05b3ca2b