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

Commit 54419a4f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by Android Git Automerger
Browse files

am 12221b6f: Merge "Fix monkey bug 2586534... 

am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack. This CL corr

Merge commit '12221b6f' into froyo-plus-aosp

* commit '12221b6f':
  Fix monkey bug 2586534 java.util.ConcurrentModificationException
parents c9eaa3cb 12221b6f

media/java/android/media/AudioService.java

+6 −2
Original line number Diff line number Diff line
@@ -2090,15 +2090,19 @@ public class AudioService extends IAudioService.Stub { 
        Log.i(TAG, " AudioFocus  abandonAudioFocus() from " + clientId);



        // this will take care of notifying the new focus owner if needed

        synchronized(mFocusStack) {

            removeFocusStackEntry(clientId, true);

        }



        return AudioManager.AUDIOFOCUS_REQUEST_GRANTED;

    }





    public void unregisterAudioFocusClient(String clientId) {

        synchronized(mFocusStack) {

            removeFocusStackEntry(clientId, false);

        }

    }





    //==========================================================================================