moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-02-16 02:20:55 +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

16
app/src/main/java/com/limelight/binding/input/ControllerHandler.java
View File

@@ -365,13 +365,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
// Count all USB devices that match our drivers
if (PreferenceConfiguration.readPreferences(context).usbDriver) {
UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
for (UsbDevice dev : usbManager.getDeviceList().values()) {
// We explicitly check not to claim devices that appear as InputDevices
// otherwise we will double count them.
if (UsbDriverService.shouldClaimDevice(dev, false) &&
!UsbDriverService.isRecognizedInputDevice(dev)) {
LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
mask |= 1 << count++;
if (usbManager != null) {
for (UsbDevice dev : usbManager.getDeviceList().values()) {
// We explicitly check not to claim devices that appear as InputDevices
// otherwise we will double count them.
if (UsbDriverService.shouldClaimDevice(dev, false) &&
!UsbDriverService.isRecognizedInputDevice(dev)) {
LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
mask |= 1 << count++;
}
}
}
}

2
app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java
View File

@@ -287,7 +287,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
}
private void start() {
if (started) {
if (started || usbManager == null) {
return;
}