Merge pull request #750 from AltBeacon/fix-android-8-out-of-memory-crash

Prevent OutOfMemoryError Crash on Android 8
AltBeacon · Oct 17, 2018 · 7e16c69 · 7e16c69
2 parents 1990ba7 + e2aa6e0
commit 7e16c69
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Development
 
+- Prevent infrequent out of memory crashes on Android 8+ (#750 Pappas Christodoulos, David G. Young)
 - Prevent duplicate ranging/monitoring callbacks casued by bind/unbind with a service
   (#748, Adrián Nieto Rodríguez, #745, David G. Young)
 - Allow starting foreground service at boot (#746, David G. Young)

diff --git a/src/main/java/org/altbeacon/beacon/service/ScanHelper.java b/src/main/java/org/altbeacon/beacon/service/ScanHelper.java
@@ -129,8 +129,9 @@ void processScanResult(BluetoothDevice device, int rssi, byte[] scanRecord) {
             new ScanHelper.ScanProcessor(nonBeaconLeScanCallback).executeOnExecutor(mExecutor,
                     new ScanHelper.ScanData(device, rssi, scanRecord));
         } catch (RejectedExecutionException e) {
-
             LogManager.w(TAG, "Ignoring scan result because we cannot keep up.");
+        } catch (OutOfMemoryError e) {
+            LogManager.w(TAG, "Ignoring scan result because we cannot start a thread to keep up.");
         }
     }
 

diff --git a/src/main/java/org/altbeacon/beacon/service/ScanJob.java b/src/main/java/org/altbeacon/beacon/service/ScanJob.java
@@ -54,7 +54,10 @@ public class ScanJob extends JobService {
 
     @Override
     public boolean onStartJob(final JobParameters jobParameters) {
-        initialzeScanHelper();
+        if (!initialzeScanHelper()) {
+            LogManager.e(TAG, "Cannot allocate a scanner to look for beacons.  System resources are low.");
+            return false;
+        }
         if (jobParameters.getJobId() == getImmediateScanJobId(this)) {
             LogManager.i(TAG, "Running immediate scan job: instance is "+this);
         }
@@ -168,7 +171,8 @@ private void stopScanning() {
         LogManager.d(TAG, "Scanning stopped");
     }
 
-    private void initialzeScanHelper() {
+    // Returns false if cycle thread cannot be allocated
+    private boolean initialzeScanHelper() {
         mScanHelper = new ScanHelper(this);
         mScanState = ScanState.restore(ScanJob.this);
         mScanState.setLastScanStartTimeMillis(System.currentTimeMillis());
@@ -177,8 +181,15 @@ private void initialzeScanHelper() {
         mScanHelper.setBeaconParsers(mScanState.getBeaconParsers());
         mScanHelper.setExtraDataBeaconTracker(mScanState.getExtraBeaconDataTracker());
         if (mScanHelper.getCycledScanner() == null) {
-            mScanHelper.createCycledLeScanner(mScanState.getBackgroundMode(), null);
+            try {
+                mScanHelper.createCycledLeScanner(mScanState.getBackgroundMode(), null);
+            }
+            catch (OutOfMemoryError e) {
+                LogManager.w(TAG, "Failed to create CycledLeScanner thread.");
+                return false;
+            }
         }
+        return true;
     }
 
     // Returns true of scanning actually was started, false if it did not need to be