Fix ConcurrentModificationException in GeofenceManager expiry purge#4581
Merged
shai-almog merged 1 commit intomasterfrom Mar 1, 2026
Merged
Conversation
✅ Continuous Quality ReportTest & Coverage
Static Analysis
Generated automatically by the PR CI workflow. |
Collaborator
Author
Android screenshot updatesCompared 32 screenshots: 31 matched, 1 updated.
Native Android coverage
|
Collaborator
Author
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.


Motivation
expiryTimes.entrySet()while removing expired entries caused aConcurrentModificationExceptionduringGeofenceManagerupdates and construction, so the purge logic needed to stop mutating the map via the enhanced-for loop.Description
GeofenceManager.purgeExpired()to iterate the expirations map with an explicitIteratorand callit.remove()when an entry is expired to avoid concurrent modification.updatePurgesExpiredGeofencesWithoutConcurrentModificationtoGeofenceManagerTestthat injects expired entries and assertsmanager.update(...)does not throw and removes the expired geofences from tracked state.setPrivateFieldused by the new test to setexpiryTimesdeterministically.Testing
export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64; export PATH="$JAVA_HOME/bin:$PATH"; cd maven && mvn -pl core-unittests -am -DunitTests=true -Dmaven.javadoc.skip=true -Dtest=GeofenceManagerTest -DfailIfNoTests=false testand theGeofenceManagerTestsuite passed (9 tests, 0 failures).BUILD SUCCESS.Codex Task