diff options
author | Eric Laurent <elaurent@google.com> | 2015-04-21 17:37:00 -0700 |
---|---|---|
committer | Eric Laurent <elaurent@google.com> | 2015-04-30 12:43:06 -0700 |
commit | 8c7e6dac6f5eb38cef627dab92eac8b38513450c (patch) | |
tree | 6aede3a6ac013462a117ffb181d93439525eebeb /services/audiopolicy/common/managerdefinitions/src | |
parent | f62a067a5b21c840c915d36392679346ac0abfd7 (diff) | |
download | frameworks_av-8c7e6dac6f5eb38cef627dab92eac8b38513450c.zip frameworks_av-8c7e6dac6f5eb38cef627dab92eac8b38513450c.tar.gz frameworks_av-8c7e6dac6f5eb38cef627dab92eac8b38513450c.tar.bz2 |
audio policy: session routes continued.
- Clear session routes when client process dies.
- Enforce the route only when the requesting session is active.
- Fix requested route not working if an output mix change is required
(e.g forcing to SPEAKER when the default route is USB or A2DP).
- Make sure all sessions sharing the strategy with a rerouted session
have the same route (needed for volume control consistency)
Change-Id: I0ab347a8fb97e73e2c5965374544c5f4fe509ef1
Diffstat (limited to 'services/audiopolicy/common/managerdefinitions/src')
-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; |