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

Commit c0d54a2a authored by Sungsoo Lim's avatar Sungsoo Lim
Browse files

Fix ConcurrentModificationException 

Bug: 73883114
Test: pass MediaComponentTest
Change-Id: I3f3df803d127fbea6228440b3abe93a2c2410f9b
parent f3fc8a4d

services/core/java/com/android/server/media/MediaSessionService.java

+4 −4
Original line number Diff line number Diff line
@@ -521,10 +521,10 @@ public class MediaSessionService extends SystemService implements Monitor { 
        synchronized (mLock) {

            // List to keep the session services that need be removed because they don't exist

            // in the 'services' above.

            Set<SessionToken2> sessionTokensToRemove = new HashSet<>(mSessionRecords.keySet());

            for (SessionToken2 token : sessionTokensToRemove) {

                if (token.getType() == TYPE_SESSION) {

                    sessionTokensToRemove.remove(token);

            Set<SessionToken2> sessionTokensToRemove = new HashSet<>();

            for (SessionToken2 token : mSessionRecords.keySet()) {

                if (token.getType() != TYPE_SESSION) {

                    sessionTokensToRemove.add(token);

                }

            }