diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-01-29 20:57:42 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-29 20:57:42 +0000 |
| commit | aae036391b83a4509f2f480f36a1a4974b05132d (patch) | |
| tree | 25da1a26df7ef641fd664282c72e5b85f6c162cb /services | |
| parent | 875cfd20f41b6e405f75fe4a9f9e848d63a67e28 (diff) | |
| parent | 88873ae1b01208a9e70b80860274f429d08a6c64 (diff) | |
| download | frameworks_av-aae036391b83a4509f2f480f36a1a4974b05132d.zip frameworks_av-aae036391b83a4509f2f480f36a1a4974b05132d.tar.gz frameworks_av-aae036391b83a4509f2f480f36a1a4974b05132d.tar.bz2 | |
am 88873ae1: am f1121d96: am 0d84ba3f: Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev
* commit '88873ae1b01208a9e70b80860274f429d08a6c64':
Fix FLAG_BEACON regression
Diffstat (limited to 'services')
| -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) { |