moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-06-16 22:01:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check for a null UsbManager object

Browse Source 
Apparently this can happen on some (broken?) devices
This commit is contained in:
Cameron Gutman
2023-10-12 00:22:28 -05:00
parent 0168a55596
commit 9915007f30
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
+9 -7
View File
@@ -365,13 +365,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
// Count all USB devices that match our drivers // Count all USB devices that match our drivers
if (PreferenceConfiguration.readPreferences(context).usbDriver) { if (PreferenceConfiguration.readPreferences(context).usbDriver) {
UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE); UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
for (UsbDevice dev : usbManager.getDeviceList().values()) { if (usbManager != null) {
// We explicitly check not to claim devices that appear as InputDevices for (UsbDevice dev : usbManager.getDeviceList().values()) {
// otherwise we will double count them. // We explicitly check not to claim devices that appear as InputDevices
if (UsbDriverService.shouldClaimDevice(dev, false) && // otherwise we will double count them.
!UsbDriverService.isRecognizedInputDevice(dev)) { if (UsbDriverService.shouldClaimDevice(dev, false) &&
LimeLog.info("Counting UsbDevice: "+dev.getDeviceName()); !UsbDriverService.isRecognizedInputDevice(dev)) {
mask |= 1 << count++; LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
mask |= 1 << count++;
}
} }
} }
} }
app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
+1 -1
View File
@@ -287,7 +287,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
} }
private void start() { private void start() {
if (started) { if (started || usbManager == null) {
return; return;
} }