diff options
| author | Jean-Michel Trivi <jmtrivi@google.com> | 2015-01-29 10:49:39 -0800 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2015-01-29 10:49:39 -0800 |
| commit | 79ad438ed25c59a37244a48899263bbc4bc92f5d (patch) | |
| tree | d54e5f2d9b1fef107e37bf2fe2b87aa44a16d8bb /services | |
| parent | 64c496c8d51c71605cd34a510da2ecd8180656ec (diff) | |
| download | frameworks_av-79ad438ed25c59a37244a48899263bbc4bc92f5d.zip frameworks_av-79ad438ed25c59a37244a48899263bbc4bc92f5d.tar.gz frameworks_av-79ad438ed25c59a37244a48899263bbc4bc92f5d.tar.bz2 | |
Fix FLAG_BEACON regression
Fix regression where FLAG_BEACON is not honored anymore in terms
of routing and muting behavior
When converting from AudioAttributes to stream types, also look
at FLAG_BEACON for mapping to STREAM_TTS
Bug 19185342
Change-Id: I5871c1b94480ae3da544aef99ea9ab4dff97443d
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 0349327..34a691d 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -7975,6 +7975,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) { |