Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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 corrects this." into froyo

Browse Source
This commit is contained in:
Jean-Michel Trivi
2010-04-12 12:05:08 -07:00
committed by Android (Google) Code Review
parent 36acfbc2b8 2930bb2d47
commit 12221b6f7c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
media/java/android/media/AudioService.java
View File

@@ -2090,14 +2090,18 @@ 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
removeFocusStackEntry(clientId, true);
synchronized(mFocusStack) {
removeFocusStackEntry(clientId, true);
}
return AudioManager.AUDIOFOCUS_REQUEST_GRANTED;
}
public void unregisterAudioFocusClient(String clientId) {
removeFocusStackEntry(clientId, false);
synchronized(mFocusStack) {
removeFocusStackEntry(clientId, false);
}
}