summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2018-08-21 11:59:13 -0700
committerSam Lantinga <slouken@libsdl.org>2018-08-21 11:59:13 -0700
commit855818fae0d8528fceb34b60760a12b7f9bdbc96 (patch)
tree72a3511268c8b10c2f5ab20086c844f3592390a8
parent18adf6be6fe611378378246e8baac813126faad9 (diff)
downloadsdl-855818fae0d8528fceb34b60760a12b7f9bdbc96.tar.gz
Don't crash if the app doesn't have Bluetooth permissions
-rw-r--r--android-project/app/src/main/java/org/libsdl/app/HIDDeviceManager.java6
1 files changed, 5 insertions, 1 deletions
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 2345a84e5..0759efff6 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.