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/managerdefault | |
| 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/managerdefault')
| -rw-r--r-- | services/audiopolicy/managerdefault/AudioPolicyManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp index 686a0e1..35e80f7 100644 --- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp +++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp @@ -1245,7 +1245,7 @@ status_t AudioPolicyManager::getInputForAttr(const audio_attributes_t *attr, if (inputSource == AUDIO_SOURCE_REMOTE_SUBMIX && strncmp(attr->tags, "addr=", strlen("addr=")) == 0) { - status_t ret = mPolicyMixes.getInputMixForAttr(*attr, policyMix); + status_t ret = mPolicyMixes.getInputMixForAttr(*attr, &policyMix); if (ret != NO_ERROR) { return ret; } @@ -1364,7 +1364,7 @@ status_t AudioPolicyManager::getInputForAttr(const audio_attributes_t *attr, inputDesc->mIsSoundTrigger = isSoundTrigger; inputDesc->mPolicyMix = policyMix; - ALOGV("getInputForAttr() returns input type = %d", inputType); + ALOGV("getInputForAttr() returns input type = %d", *inputType); addInput(*input, inputDesc); mpClientInterface->onAudioPortListUpdate(); @@ -3106,7 +3106,7 @@ status_t AudioPolicyManager::checkOutputsForDevice(const sp<DeviceDescriptor> de address.string()); } policyMix->setOutput(desc); - desc->mPolicyMix = &(policyMix->getMix()); + desc->mPolicyMix = policyMix->getMix(); } else if ((desc->mFlags & AUDIO_OUTPUT_FLAG_DIRECT) == 0) { // no duplicated output for direct outputs and |