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

am 9ab05fff: Merge "Fix bug 2565463 Ensure an object cannot appear twice in the AudioFocus stack. Enforce parameter check in AudioManager.requestAudioFocus() Typo correction in AudioService.unregisterMediaButtonEventReceiver()" into froyo

Browse Source 
Merge commit '9ab05fff41e983c9b3175096c320aefced81276b' into froyo-plus-aosp

* commit '9ab05fff41e983c9b3175096c320aefced81276b':
  Fix bug 2565463 Ensure an object cannot appear twice in the
This commit is contained in:
Jean-Michel Trivi
2010-04-02 09:12:10 -07:00
committed by Android Git Automerger
parent 6c8770df93 9ab05fff41
commit 28525488fb
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
media/java/android/media/AudioManager.java
View File

@@ -1437,6 +1437,11 @@ public class AudioManager {
*/ */
public int requestAudioFocus(OnAudioFocusChangeListener l, int streamType, int durationHint) { public int requestAudioFocus(OnAudioFocusChangeListener l, int streamType, int durationHint) {
int status = AUDIOFOCUS_REQUEST_FAILED; int status = AUDIOFOCUS_REQUEST_FAILED;
if ((durationHint < AUDIOFOCUS_GAIN) || (durationHint > AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK))
{
Log.e(TAG, "Invalid duration hint, audio focus request denied");
return status;
}
registerAudioFocusListener(l); registerAudioFocusListener(l);
//TODO protect request by permission check? //TODO protect request by permission check?
IAudioService service = getService(); IAudioService service = getService();

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

@@ -2063,6 +2063,9 @@ public class AudioService extends IAudioService.Stub {
} }
} }
// focus requester might already be somewhere below in the stack, remove it
removeFocusStackEntry(clientId, false);
// push focus requester at the top of the audio focus stack // push focus requester at the top of the audio focus stack
mFocusStack.push(new FocusStackEntry(mainStreamType, focusChangeHint, false, fd, cb, mFocusStack.push(new FocusStackEntry(mainStreamType, focusChangeHint, false, fd, cb,
clientId)); clientId));
@@ -2215,7 +2218,7 @@ public class AudioService extends IAudioService.Stub {
/** see AudioManager.unregisterMediaButtonEventReceiver(ComponentName eventReceiver) */ /** see AudioManager.unregisterMediaButtonEventReceiver(ComponentName eventReceiver) */
public void unregisterMediaButtonEventReceiver(ComponentName eventReceiver) { public void unregisterMediaButtonEventReceiver(ComponentName eventReceiver) {
Log.i(TAG, " Remote Control registerMediaButtonEventReceiver() for " + eventReceiver); Log.i(TAG, " Remote Control unregisterMediaButtonEventReceiver() for " + eventReceiver);
synchronized(mRCStack) { synchronized(mRCStack) {
removeMediaButtonReceiver(eventReceiver); removeMediaButtonReceiver(eventReceiver);