Merge pull request #200 from AltBeacon/fix-gn4-npe

Attempt to fix NPE on Galaxy Note 4 5.0.1
AltBeacon · Jun 18, 2015 · 6f0b4a2 · 6f0b4a2
2 parents e8f3f68 + b11fe2a
commit 6f0b4a2
Showing 1 changed file with 16 additions and 3 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
@@ -98,8 +98,15 @@ protected boolean deferScanIfNeeded() {
 
                         try {
                             if (getScanner() != null) {
-                                getScanner().startScan(new ScanFilterUtils().createScanFiltersForBeaconParsers(
-                                        mBeaconManager.getBeaconParsers()), settings, getNewLeScanCallback());
+                                List scanFilters = new ScanFilterUtils().createScanFiltersForBeaconParsers(
+                                        mBeaconManager.getBeaconParsers());
+                                ScanCallback callback = getNewLeScanCallback();
+                                try {
+                                    getScanner().startScan(scanFilters, settings, callback);
+                                }
+                                catch (NullPointerException npe) {
+                                    LogManager.w(TAG, "Cannot start scan.  Unexpected NPE.", npe);
+                                }
                             }
                         }
                         catch (IllegalStateException e) {
@@ -192,7 +199,13 @@ protected void startScan() {
         }
         try {
             if (getScanner() != null) {
-                getScanner().startScan(filters, settings, getNewLeScanCallback());
+                ScanCallback callback = getNewLeScanCallback();
+                try {
+                    getScanner().startScan(filters, settings, callback);
+                }
+                catch (NullPointerException npe) {
+                    LogManager.w(TAG, "Cannot start scan.  Unexpected NPE.", npe);
+                }
             }
         }
         catch (IllegalStateException e) {