Merge branch 'fix-crash-from-929' into 2.16.4-beta

AltBeacon · Jan 9, 2020 · d12e2dc · d12e2dc
2 parents 2cbd24f + 98b8093
commit d12e2dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,6 @@
 ### Development
 
+- Fix ConcurrentModificationException crash on background detection reported in #929. (#940, David G. Young)
 - Expedite beacon detections on Samsung when transitionoing from screen on to screen onff (#941, David G. Young)
 
 ### 2.16.3 / 2019-09-18

diff --git a/lib/src/main/java/org/altbeacon/beacon/service/ScanJob.java b/lib/src/main/java/org/altbeacon/beacon/service/ScanJob.java
@@ -77,7 +77,7 @@ public void run() {
                     LogManager.i(TAG, "Running periodic scan job: instance is "+ScanJob.this);
                 }
 
-                List<ScanResult> queuedScanResults = ScanJobScheduler.getInstance().dumpBackgroundScanResultQueue();
+                List<ScanResult> queuedScanResults =  new ArrayList<>(ScanJobScheduler.getInstance().dumpBackgroundScanResultQueue());
                 LogManager.d(TAG, "Processing %d queued scan resuilts", queuedScanResults.size());
                 for (ScanResult result : queuedScanResults) {
                     ScanRecord scanRecord = result.getScanRecord();