loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid using ConcurrentHashMap

Browse Source 
Use Collections.synchronizedSet() instead of creating a set from a
ConcurrentHashMap because ConcurrentHashMap has a bug in APIs 21/22
that can result in lost updates.

PiperOrigin-RevId: 453696565
(cherry picked from commit d506c709c9a793d751908aac879f2f85b74f7b58)
This commit is contained in:
christosts 2022-06-08 16:23:18 +00:00 committed by Marc Baechinger
parent 31c7ccbc49
commit 35c9585f5f
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/session/src/main/java/androidx/media3/session/MediaSessionService.java
View File

@ -43,10 +43,10 @@ import androidx.media3.session.MediaSession.ControllerInfo;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.checkerframework.checker.nullness.qual.MonotonicNonNull; import org.checkerframework.checker.nullness.qual.MonotonicNonNull;
/** /**
@ -472,7 +472,8 @@ public abstract class MediaSessionService extends Service {
Context context = serviceReference.getApplicationContext(); Context context = serviceReference.getApplicationContext();
handler = new Handler(context.getMainLooper()); handler = new Handler(context.getMainLooper());
mediaSessionManager = MediaSessionManager.getSessionManager(context); mediaSessionManager = MediaSessionManager.getSessionManager(context);
pendingControllers = Collections.newSetFromMap(new ConcurrentHashMap<>()); // ConcurrentHashMap has a bug in APIs 21-22 that can result in lost updates.
pendingControllers = Collections.synchronizedSet(new HashSet<>());
} }
@Override @Override

5
libraries/session/src/main/java/androidx/media3/session/MediaSessionStub.java
View File

@ -83,10 +83,10 @@ import com.google.common.util.concurrent.MoreExecutors;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Collections; import java.util.Collections;
import java.util.Deque; import java.util.Deque;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CancellationException; import java.util.concurrent.CancellationException;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
/** /**
@ -109,7 +109,8 @@ import java.util.concurrent.ExecutionException;
this.sessionImpl = new WeakReference<>(sessionImpl); this.sessionImpl = new WeakReference<>(sessionImpl);
sessionManager = MediaSessionManager.getSessionManager(sessionImpl.getContext()); sessionManager = MediaSessionManager.getSessionManager(sessionImpl.getContext());
connectedControllersManager = new ConnectedControllersManager<>(sessionImpl); connectedControllersManager = new ConnectedControllersManager<>(sessionImpl);
pendingControllers = Collections.newSetFromMap(new ConcurrentHashMap<>()); // ConcurrentHashMap has a bug in APIs 21-22 that can result in lost updates.
pendingControllers = Collections.synchronizedSet(new HashSet<>());
} }
public ConnectedControllersManager<IBinder> getConnectedControllersManager() { public ConnectedControllersManager<IBinder> getConnectedControllersManager() {