summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2014-11-24 14:43:10 -0800
committerJean-Michel Trivi <jmtrivi@google.com>2014-12-05 18:41:28 -0800
commit0212be5150fb9fb3c340f3c7e51f6126372cc6f9 (patch)
tree929f98806b4edb3591c5398881252fcd5c81b497 /Android.mk
parent7792b714b66e3af57bc243666b7843b0adf9c0b3 (diff)
downloadframeworks_base-0212be5150fb9fb3c340f3c7e51f6126372cc6f9.zip
frameworks_base-0212be5150fb9fb3c340f3c7e51f6126372cc6f9.tar.gz
frameworks_base-0212be5150fb9fb3c340f3c7e51f6126372cc6f9.tar.bz2
Support collaborative audio focus handling
Add new flag for an app to define it doesn't duck, but rather pauses when losing focus with AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK. This flag is to be used when requesting focus. Add support for AudioPolicy to specify whether it will implement ducking itself, rather than it being handled by an app. When ducking is handled by a policy, do not notify focus owners when they lose audio focus with LOSS_TRANSIENT_CAN_DUCK, unless they would have paused, as expressed with the AUDIOFOCUS_FLAG_PAUSES_ON_DUCKABLE_LOSS flag. Add a focus listener for a policy to be notified of focus changes so it can properly implement its own ducking. Bug 16010554 Change-Id: I11d7cdb85c52fd086128a44f4d938aaa44db5c25
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 1416472..dd564557 100644
--- a/Android.mk
+++ b/Android.mk
@@ -330,6 +330,7 @@ LOCAL_SRC_FILES += \
media/java/android/media/IRemoteVolumeObserver.aidl \
media/java/android/media/IRingtonePlayer.aidl \
media/java/android/media/IVolumeController.aidl \
+ media/java/android/media/audiopolicy/IAudioPolicyCallback.aidl \
media/java/android/media/projection/IMediaProjection.aidl \
media/java/android/media/projection/IMediaProjectionCallback.aidl \
media/java/android/media/projection/IMediaProjectionManager.aidl \
@@ -437,6 +438,7 @@ aidl_files := \
frameworks/base/media/java/android/media/MediaDescription.aidl \
frameworks/base/media/java/android/media/Rating.aidl \
frameworks/base/media/java/android/media/AudioAttributes.aidl \
+ frameworks/base/media/java/android/media/AudioFocusInfo.aidl \
frameworks/base/media/java/android/media/session/PlaybackState.aidl \
frameworks/base/media/java/android/media/session/MediaSession.aidl \
frameworks/base/media/java/android/media/tv/TvInputInfo.aidl \