summaryrefslogtreecommitdiffstats
path: root/media/libmedia/AudioPolicy.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2015-04-14 19:10:14 -0700
committerJean-Michel Trivi <jmtrivi@google.com>2015-04-14 19:20:20 -0700
commitde80105c3f2db0eabd47640c49387ea3b44d4782 (patch)
tree9775c7bbe30ef1ab13a888def8531cb0f87b1756 /media/libmedia/AudioPolicy.cpp
parent079e121934106860af5ff5491bd3884453d1fdb3 (diff)
downloadframeworks_av-de80105c3f2db0eabd47640c49387ea3b44d4782.zip
frameworks_av-de80105c3f2db0eabd47640c49387ea3b44d4782.tar.gz
frameworks_av-de80105c3f2db0eabd47640c49387ea3b44d4782.tar.bz2
AudioPolicyManager: notification of dynamic policy mix activity
Implement non-stream type specific ref counting in output descriptors to keep track of mix activity. Notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Iec939cb640c58056f88947b611d23b4bb6d8a11b
Diffstat (limited to 'media/libmedia/AudioPolicy.cpp')
-rw-r--r--media/libmedia/AudioPolicy.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmedia/AudioPolicy.cpp b/media/libmedia/AudioPolicy.cpp
index c7dafcb..786eb63 100644
--- a/media/libmedia/AudioPolicy.cpp
+++ b/media/libmedia/AudioPolicy.cpp
@@ -68,6 +68,7 @@ status_t AudioMix::readFromParcel(Parcel *parcel)
mFormat.format = (audio_format_t)parcel->readInt32();
mRouteFlags = parcel->readInt32();
mRegistrationId = parcel->readString8();
+ mFlags = (uint32_t)parcel->readInt32();
size_t size = (size_t)parcel->readInt32();
if (size > MAX_CRITERIA_PER_MIX) {
size = MAX_CRITERIA_PER_MIX;
@@ -89,6 +90,7 @@ status_t AudioMix::writeToParcel(Parcel *parcel) const
parcel->writeInt32(mFormat.format);
parcel->writeInt32(mRouteFlags);
parcel->writeString8(mRegistrationId);
+ parcel->writeInt32(mFlags);
size_t size = mCriteria.size();
if (size > MAX_CRITERIA_PER_MIX) {
size = MAX_CRITERIA_PER_MIX;