diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-08 18:16:39 -0700 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-08 18:19:16 -0700 |
| commit | dacc06f5e8d00ace9d16a149fc41ff65323ffbb3 (patch) | |
| tree | 66fc2772a1a663554e871dabc96f9e1cd5a740fc /services/audiopolicy/common/managerdefinitions/include | |
| parent | e41b5f31148f9cfb7316295c900c7d3c695510b2 (diff) | |
| download | frameworks_av-dacc06f5e8d00ace9d16a149fc41ff65323ffbb3.zip frameworks_av-dacc06f5e8d00ace9d16a149fc41ff65323ffbb3.tar.gz frameworks_av-dacc06f5e8d00ace9d16a149fc41ff65323ffbb3.tar.bz2 | |
Fix AudioPolicyManager dynamic policy initialization
AudioPolicyManager::getInputForAttr() is initializing the AudioMix
for the new AudioInputDescriptor.
The audio policy manager refactoring introduced a regression where
the association of an existing AudioMix (registered when the
associated AudioPolicy was registered) with the input descriptor
copied a value of local scope, instead of referencing the
AudioMix in the list of mixes.
Bug 20081375
Change-Id: Iddd57fed8525880afd1d4a5493f97130aabe4816
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include')
| -rw-r--r-- | services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h index 988aed6..816ec05 100644 --- a/services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h +++ b/services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h @@ -39,7 +39,7 @@ public: void clearOutput(); - android::AudioMix &getMix(); + android::AudioMix *getMix(); void setMix(AudioMix &mix); @@ -75,7 +75,7 @@ public: audio_devices_t availableDeviceTypes, AudioMix **policyMix); - status_t getInputMixForAttr(audio_attributes_t attr, AudioMix *&policyMix); + status_t getInputMixForAttr(audio_attributes_t attr, AudioMix **policyMix); }; }; // namespace android |