diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-01-29 20:29:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 20:29:40 +0000 |
| commit | f1121d963b51c798ab28c85eeff1eedc9bb2c186 (patch) | |
| tree | 6242a784e02b2001232ef67593cd9aabb5606c3b /services/audiopolicy | |
| parent | ce25d85ad22e6df4b861d17e9e67cb6d0e62c363 (diff) | |
| parent | 0d84ba3fd82038cb721ffae234a99e6751ed7fbe (diff) | |
| download | frameworks_av-f1121d963b51c798ab28c85eeff1eedc9bb2c186.zip frameworks_av-f1121d963b51c798ab28c85eeff1eedc9bb2c186.tar.gz frameworks_av-f1121d963b51c798ab28c85eeff1eedc9bb2c186.tar.bz2 | |
am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev
* commit '0d84ba3fd82038cb721ffae234a99e6751ed7fbe':
Fix FLAG_BEACON regression
Diffstat (limited to 'services/audiopolicy')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index fb74d66..4e62904 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -7981,6 +7981,9 @@ audio_stream_type_t AudioPolicyManager::streamTypefromAttributesInt(const audio_ if ((attr->flags & AUDIO_FLAG_SCO) == AUDIO_FLAG_SCO) { return AUDIO_STREAM_BLUETOOTH_SCO; } + if ((attr->flags & AUDIO_FLAG_BEACON) == AUDIO_FLAG_BEACON) { + return AUDIO_STREAM_TTS; + } // usage to stream type mapping switch (attr->usage) { |