diff options
| author | mike dooley <mdooley@google.com> | 2014-09-18 14:07:52 -0700 |
|---|---|---|
| committer | Michael Dooley <mdooley@google.com> | 2014-09-23 17:34:10 +0000 |
| commit | 95e8070e296e2fc327d09334ec97103f8b32b848 (patch) | |
| tree | dc2dfccb6bc3c2c01094d435243b816de5036661 /telecomm | |
| parent | 79355e03041aa67f56445844474d1e4875eb4328 (diff) | |
| download | frameworks_base-95e8070e296e2fc327d09334ec97103f8b32b848.zip frameworks_base-95e8070e296e2fc327d09334ec97103f8b32b848.tar.gz frameworks_base-95e8070e296e2fc327d09334ec97103f8b32b848.tar.bz2 | |
Fixing ConcurrentModificationException.
Implementing review feedback.
Bug: 17572658
Change-Id: I3a060d21669a58188a24c5d6ec5fefcbca45a976
Diffstat (limited to 'telecomm')
| -rw-r--r-- | telecomm/java/android/telecom/ConnectionService.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index 05255b1..ed9251b 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -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<>(); |