Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6493093a: am 79a88649: am f2004bab: am deb3f099: am 6e466a1b: Fixing ConcurrentModificationException.

Browse Source 
* commit '6493093a71296f21576edf77fcd377a680e073a3':
  Fixing ConcurrentModificationException.
This commit is contained in:
mike dooley
2014-09-23 20:56:05 +00:00
committed by Android Git Automerger
parent 68b2139040 ab9241394a
commit 0822ffb51d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telecomm/java/android/telecom/ConnectionService.java
View File

@@ -35,10 +35,10 @@ import com.android.internal.telecom.RemoteServiceCallback;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
/**
* A {@link android.app.Service} that provides telephone connections to processes running on an
@@ -77,10 +77,10 @@ public abstract class ConnectionService extends Service {
private static Connection sNullConnection;
private final Map<String, Connection> mConnectionById = new HashMap<>();
private final Map<Connection, String> mIdByConnection = new HashMap<>();
private final Map<String, Conference> mConferenceById = new HashMap<>();
private final Map<Conference, String> mIdByConference = new HashMap<>();
private final Map<String, Connection> mConnectionById = new ConcurrentHashMap<>();
private final Map<Connection, String> mIdByConnection = new ConcurrentHashMap<>();
private final Map<String, Conference> mConferenceById = new ConcurrentHashMap<>();
private final Map<Conference, String> mIdByConference = new ConcurrentHashMap<>();
private final RemoteConnectionManager mRemoteConnectionManager =
new RemoteConnectionManager(this);
private final List<Runnable> mPreInitializationConnectionRequests = new ArrayList<>();