Commit c2791fc60d61b25e2e4c0ca55ff07401683e05f1

Sam Lantinga 2018-08-21T11:59:13

Don't crash if the app doesn't have Bluetooth permissions

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
diff --git a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
index 2345a84..0759eff 100644
--- a/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
+++ b/android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java
@@ -366,7 +366,11 @@ public class HIDDeviceManager {
     }
 
     protected void shutdownBluetooth() {
-        mContext.unregisterReceiver(mBluetoothBroadcast);
+        try {
+            mContext.unregisterReceiver(mBluetoothBroadcast);
+        } catch (Exception e) {
+            // We may not have registered, that's okay
+        }
     }
 
     // Chromebooks do not pass along ACTION_ACL_CONNECTED / ACTION_ACL_DISCONNECTED properly.