diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-04-09 01:33:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-09 01:33:20 +0000 |
| commit | b6347ac62b36b4d9578d181ba83bf8e6446298e8 (patch) | |
| tree | fa04d4c41a7f661448668c01a056b9e71297cd16 /services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h | |
| parent | 17769490d499bc665ddfef83143ac1ed647fa0d4 (diff) | |
| parent | dacc06f5e8d00ace9d16a149fc41ff65323ffbb3 (diff) | |
| download | frameworks_av-b6347ac62b36b4d9578d181ba83bf8e6446298e8.zip frameworks_av-b6347ac62b36b4d9578d181ba83bf8e6446298e8.tar.gz frameworks_av-b6347ac62b36b4d9578d181ba83bf8e6446298e8.tar.bz2 | |
Merge "Fix AudioPolicyManager dynamic policy initialization"
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/include/AudioPolicyMix.h')
| -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 67285f3..d51f4e1 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 |