diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-23 18:41:29 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-29 17:54:12 -0700 |
| commit | f613d42b12389335b2ecf06df18d0d095d6bfd44 (patch) | |
| tree | b36177007932b781d9db2bb973cb2feaab3cde13 /media/libmedia/AudioPolicy.cpp | |
| parent | dae24729d0b3ced8c4a7d7f9b631e852f564db4f (diff) | |
| download | frameworks_av-f613d42b12389335b2ecf06df18d0d095d6bfd44.zip frameworks_av-f613d42b12389335b2ecf06df18d0d095d6bfd44.tar.gz frameworks_av-f613d42b12389335b2ecf06df18d0d095d6bfd44.tar.bz2 | |
AudioSystem callback for dynamic policy mix activity
Add method to AudioPolicyServiceClient for dynamic policy mix
activity notification.
Propagate notification to a dedicated callback.
Bug 20226914
Change-Id: I37928ed38e15ea2b8fed022cccadeca8c4d6c876
Diffstat (limited to 'media/libmedia/AudioPolicy.cpp')
| -rw-r--r-- | media/libmedia/AudioPolicy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/AudioPolicy.cpp b/media/libmedia/AudioPolicy.cpp index 786eb63..9d07011 100644 --- a/media/libmedia/AudioPolicy.cpp +++ b/media/libmedia/AudioPolicy.cpp @@ -68,7 +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(); + mCbFlags = (uint32_t)parcel->readInt32(); size_t size = (size_t)parcel->readInt32(); if (size > MAX_CRITERIA_PER_MIX) { size = MAX_CRITERIA_PER_MIX; @@ -90,7 +90,7 @@ status_t AudioMix::writeToParcel(Parcel *parcel) const parcel->writeInt32(mFormat.format); parcel->writeInt32(mRouteFlags); parcel->writeString8(mRegistrationId); - parcel->writeInt32(mFlags); + parcel->writeInt32(mCbFlags); size_t size = mCriteria.size(); if (size > MAX_CRITERIA_PER_MIX) { size = MAX_CRITERIA_PER_MIX; |