Don't start or stop scans if bluetooth state is off to prevent crashe…

…s on HTC devis
AltBeacon · Nov 16, 2016 · 2df2286 · 2df2286
1 parent e855723
commit 2df2286
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScannerForLollipop.java b/src/main/java/org/altbeacon/beacon/service/scanner/CycledLeScannerForLollipop.java
@@ -155,6 +155,10 @@ public void run() {
 
     @Override
     protected void startScan() {
+        if (!isBluetoothOn()) {
+            LogManager.d(TAG, "Not starting scan because bluetooth is off");
+            return;
+        }
         List<ScanFilter> filters = new ArrayList<ScanFilter>();
         ScanSettings settings;
 
@@ -205,6 +209,10 @@ public void run() {
     }
 
     private void postStopLeScan() {
+        if (!isBluetoothOn()){
+            LogManager.d(TAG, "Not stopping scan because bluetooth is off");
+            return;
+        }
         final BluetoothLeScanner scanner = getScanner();
         if (scanner == null) {
             return;
@@ -230,6 +238,20 @@ public void run() {
         });
     }
 
+    private boolean isBluetoothOn() {
+        try {
+            BluetoothAdapter bluetoothAdapter = getBluetoothAdapter();
+            if (bluetoothAdapter != null) {
+                return (bluetoothAdapter.getState() == BluetoothAdapter.STATE_ON);
+            }
+            LogManager.w(TAG, "Cannot get bluetooth adapter");
+        }
+        catch (SecurityException e) {
+            LogManager.w(TAG, "SecurityException checking if bluetooth is on");
+        }
+        return false;
+    }
+
     private BluetoothLeScanner getScanner() {
         try {
             if (mScanner == null) {