From 1087c224f9e9629610e6a6c5aa1ccc41b1b71582 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Tue, 2 Jul 2019 16:08:37 -0700
Subject: [PATCH] Cherry-pick android joystick crash fixes from master

---
 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 9923c8f..ea225c2 100644
--- a/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
+++ b/android/src/org/mavlink/qgroundcontrol/QGCActivity.java
@@ -106,7 +106,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)) {
@@ -710,6 +710,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 {