diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-01-29 20:22:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-01-29 20:22:58 +0000 |
| commit | 0d84ba3fd82038cb721ffae234a99e6751ed7fbe (patch) | |
| tree | 6242a784e02b2001232ef67593cd9aabb5606c3b /services/audiopolicy | |
| parent | a93fd2be99d21629bed504b9b7df035fc2f54562 (diff) | |
| parent | 79ad438ed25c59a37244a48899263bbc4bc92f5d (diff) | |
| download | frameworks_av-0d84ba3fd82038cb721ffae234a99e6751ed7fbe.zip frameworks_av-0d84ba3fd82038cb721ffae234a99e6751ed7fbe.tar.gz frameworks_av-0d84ba3fd82038cb721ffae234a99e6751ed7fbe.tar.bz2 | |
Merge "Fix FLAG_BEACON regression" into lmp-mr1-dev
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) { |