From fafd4209c1a1e8dd43c446a9a1661efa2c92db13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Fran=C4=8De=C5=A1kin?= <Matej@auterion.com>
Date: Thu, 16 May 2019 09:10:18 +0200
Subject: [PATCH] Fix for java open accessory crash

---
 android/src/org/mavlink/qgroundcontrol/QGCActivity.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
index 2c772f6b4..6b10fd965 100644
--- a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
+++ b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
@@ -107,7 +107,7 @@ public class QGCActivity extends QtActivity
                 String action = intent.getAction();
                 if (ACTION_USB_PERMISSION.equals(action)) {
                     UsbAccessory accessory = intent.getParcelableExtra(UsbManager.EXTRA_ACCESSORY);
-                    if (intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
+                    if (accessory != null && intent.getBooleanExtra(UsbManager.EXTRA_PERMISSION_GRANTED, false)) {
                         openAccessory(accessory);
                     }
                 } else if( UsbManager.ACTION_USB_ACCESSORY_DETACHED.equals(action)) {
@@ -730,6 +730,9 @@ public class QGCActivity extends QtActivity
                     UsbAccessory[] accessories = _usbManager.getAccessoryList();
                     if (accessories != null) {
                        for (UsbAccessory usbAccessory : accessories) {
+                           if (usbAccessory == null) {
+                               continue;
+                           }
                            if (_usbManager.hasPermission(usbAccessory)) {
                                openAccessory(usbAccessory);
                            } else {
-- 
2.22.0