From 46c5eaf0e192f9515fdda977d097991474c5c62e Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 23 Dec 2015 14:03:55 -0600 Subject: [PATCH] Fix a user-reported crash in USB code --- .../limelight/binding/input/driver/UsbDriverService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java index fdafbcc0..4c020aed 100644 --- a/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java +++ b/app/src/main/java/com/limelight/binding/input/driver/UsbDriverService.java @@ -12,6 +12,8 @@ import android.hardware.usb.UsbManager; import android.os.Binder; import android.os.IBinder; +import com.limelight.LimeLog; + import java.util.ArrayList; public class UsbDriverService extends Service implements UsbDriverListener { @@ -110,6 +112,10 @@ public class UsbDriverService extends Service implements UsbDriverListener { // Open the device UsbDeviceConnection connection = usbManager.openDevice(device); + if (connection == null) { + LimeLog.warning("Unable to open USB device: "+device.getDeviceName()); + return; + } // Try to initialize it XboxOneController controller = new XboxOneController(device, connection, nextDeviceId++, this);