Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0c0e36f authored by Jay Shrauner's avatar Jay Shrauner
Browse files

Use thread safe set for adapter set 

Switch from HashSet to set backed by a ConcurrentHashMap to prevent
ConcurrentModificationExceptions.

Bug:16898286
Change-Id: I5d94b403469e98c5f5431fc1d0ad020985100cfd
parent 7f708ecc

telecomm/java/android/telecomm/ConnectionServiceAdapter.java

+4 −2
Original line number Diff line number Diff line
@@ -29,10 +29,11 @@ import com.android.internal.telecomm.IVideoCallProvider; 
import com.android.internal.telecomm.RemoteServiceCallback;



import java.util.ArrayList;

import java.util.HashSet;

import java.util.Collections;

import java.util.Iterator;

import java.util.List;

import java.util.Set;

import java.util.concurrent.ConcurrentHashMap;



/**

 * Provides methods for IConnectionService implementations to interact with the system phone app.
@@ -40,7 +41,8 @@ import java.util.Set; 
 * @hide

 */

final class ConnectionServiceAdapter implements DeathRecipient {

    private final Set<IConnectionServiceAdapter> mAdapters = new HashSet<>();

    private final Set<IConnectionServiceAdapter> mAdapters = Collections.newSetFromMap(

            new ConcurrentHashMap<IConnectionServiceAdapter, Boolean>(2));



    ConnectionServiceAdapter() {

    }