Skip to content

Fix ConcurrentModificationException in MultiConnectionKeeper #3553

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −6
Open

Fix ConcurrentModificationException in MultiConnectionKeeper #3553

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import static android.os.Build.VERSION.SDK_INT;
import static org.microg.gms.common.Constants.GMS_PACKAGE_NAME;
Expand Down Expand Up @@ -201,11 +202,11 @@ public synchronized void unbind(String action, ServiceConnection connection) {
public class Connection {
private final String actionString;
private final boolean requireMicrog;
private final Set<ServiceConnection> connectionForwards = new HashSet<ServiceConnection>();
private boolean bound = false;
private boolean connected = false;
private IBinder binder;
private ComponentName component;
private final Set<ServiceConnection> connectionForwards = Collections.newSetFromMap(new ConcurrentHashMap<>());
private volatile boolean bound = false;
private volatile boolean connected = false;
private volatile IBinder binder;
private volatile ComponentName component;
private ServiceConnection serviceConnection = new ServiceConnection() {
@Override
public void onServiceConnected(ComponentName componentName, IBinder iBinder) {
Expand Down