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

Commit 72843377 authored by Jean-Michel Trivi's avatar Jean-Michel Trivi
Browse files

Fix bug 2659754 ConcurrentModificationException in audio focus changes 

While iterating over the audio focus stack or the media button
 receiver stacks, do not modify the stack other than through the
 iterator object.

Change-Id: Ice8827e7d29afed72b40c93edf7401cd54ba4b0c
parent d589fea8

media/java/android/media/AudioService.java

+4 −4
Original line number Diff line number Diff line
@@ -2496,7 +2496,7 @@ public class AudioService extends IAudioService.Stub { 
                if(fse.mClientId.equals(clientToRemove)) {

                    Log.i(TAG, " AudioFocus  abandonAudioFocus(): removing entry for "

                            + fse.mClientId);

                    mFocusStack.remove(fse);

                    stackIterator.remove();

                }

            }

        }
@@ -2516,7 +2516,7 @@ public class AudioService extends IAudioService.Stub { 
            if(fse.mSourceRef.equals(cb)) {

                Log.i(TAG, " AudioFocus  abandonAudioFocus(): removing entry for "

                        + fse.mClientId);

                mFocusStack.remove(fse);

                stackIterator.remove();

            }

        }

        if (isTopOfStackForClientToRemove) {
@@ -2789,7 +2789,7 @@ public class AudioService extends IAudioService.Stub { 
        while(stackIterator.hasNext()) {

            RemoteControlStackEntry rcse = (RemoteControlStackEntry)stackIterator.next();

            if(rcse.mReceiverComponent.equals(newReceiver)) {

                mRCStack.remove(rcse);

                stackIterator.remove();

                break;

            }

        }
@@ -2809,7 +2809,7 @@ public class AudioService extends IAudioService.Stub { 
        while(stackIterator.hasNext()) {

            RemoteControlStackEntry rcse = (RemoteControlStackEntry)stackIterator.next();

            if(rcse.mReceiverComponent.equals(newReceiver)) {

                mRCStack.remove(rcse);

                stackIterator.remove();

                break;

            }

        }