diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-18 20:11:23 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-18 20:11:24 +0000 |
| commit | 8cd37d677f10a7718c9247830652a588ea4600de (patch) | |
| tree | ab4d591b6073e9d021108db68a974e0e4cd4496c /media | |
| parent | 35b0f7095fac4f2cc112edd4b0298a9cb1ee394f (diff) | |
| parent | 29e6cecdd8562700ab625c5645ddd6a7753789f1 (diff) | |
| download | frameworks_av-8cd37d677f10a7718c9247830652a588ea4600de.zip frameworks_av-8cd37d677f10a7718c9247830652a588ea4600de.tar.gz frameworks_av-8cd37d677f10a7718c9247830652a588ea4600de.tar.bz2 | |
Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp-mr1-dev
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/AudioTrack.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp index 2f57b9d..c11050e 100644 --- a/media/libmedia/AudioTrack.cpp +++ b/media/libmedia/AudioTrack.cpp @@ -2149,6 +2149,11 @@ void AudioTrack::setStreamTypeFromAttributes(audio_attributes_t& aa) { mStreamType = AUDIO_STREAM_ALARM; break; } + audio_mode_t phoneState = AudioSystem::getPhoneState(); + if (phoneState == AUDIO_MODE_IN_CALL || phoneState == AUDIO_MODE_IN_COMMUNICATION) { + mStreamType = AUDIO_STREAM_VOICE_CALL; + break; + } } /// FALL THROUGH case AUDIO_USAGE_MEDIA: case AUDIO_USAGE_GAME: |