diff options
author | Eric Laurent <elaurent@google.com> | 2015-04-30 19:50:55 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 19:50:55 +0000 |
commit | 5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc (patch) | |
tree | f69b635690cbc2cff9e5cfb8843e4473cc327208 /services/audiopolicy/common | |
parent | 1471e7a112aed5ff120c2b97bced9523ed39fe6c (diff) | |
parent | 8c7e6dac6f5eb38cef627dab92eac8b38513450c (diff) | |
download | frameworks_av-5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc.zip frameworks_av-5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc.tar.gz frameworks_av-5f9bf49397b36ad4ebd838aef66b83e9e9fa42bc.tar.bz2 |
Merge "audio policy: session routes continued." into mnc-dev
Diffstat (limited to 'services/audiopolicy/common')
-rw-r--r-- | services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp index 77fc0b9..6f1998c 100644 --- a/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp +++ b/services/audiopolicy/common/managerdefinitions/src/AudioPolicyMix.cpp @@ -176,14 +176,14 @@ status_t AudioPolicyMixCollection::getInputMixForAttr(audio_attributes_t attr, A ssize_t index = indexOfKey(address); if (index < 0) { - ALOGW("getInputForAttr() no policy for address %s", address.string()); + ALOGW("getInputMixForAttr() no policy for address %s", address.string()); return BAD_VALUE; } sp<AudioPolicyMix> audioPolicyMix = valueAt(index); AudioMix *mix = audioPolicyMix->getMix(); if (mix->mMixType != MIX_TYPE_PLAYERS) { - ALOGW("getInputForAttr() bad policy mix type for address %s", address.string()); + ALOGW("getInputMixForAttr() bad policy mix type for address %s", address.string()); return BAD_VALUE; } *policyMix = mix; |