diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-18 20:23:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-18 20:23:27 +0000 |
| commit | 9544a8e904955f4b96ec9f2d6f4edc2a72afd270 (patch) | |
| tree | f50154cfe53b481c0694b9c0ad31d1b1d235183e /media/libmedia/AudioTrack.cpp | |
| parent | 3126b50345a9fc0e5d6d9e58226795735e04932f (diff) | |
| parent | bfa77b5c687f217e26267693306aaa6cc8a63672 (diff) | |
| download | frameworks_av-9544a8e904955f4b96ec9f2d6f4edc2a72afd270.zip frameworks_av-9544a8e904955f4b96ec9f2d6f4edc2a72afd270.tar.gz frameworks_av-9544a8e904955f4b96ec9f2d6f4edc2a72afd270.tar.bz2 | |
am bfa77b5c: am 8cd37d67: Merge "audio policy: do not prevent routing to A2DP when suspended." into lmp-mr1-dev
* commit 'bfa77b5c687f217e26267693306aaa6cc8a63672':
audio policy: do not prevent routing to A2DP when suspended.
Diffstat (limited to 'media/libmedia/AudioTrack.cpp')
| -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 b45a420..3248adb 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: |