diff options
| author | Eric Laurent <elaurent@google.com> | 2014-11-26 12:01:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 12:01:59 +0000 |
| commit | e0f440094345e1e7c3836fe29d3fa34d84e43aee (patch) | |
| tree | 952b5f300dfae0cf578980b7f983d900965e2684 /services | |
| parent | 72215491c60fbcdb9a2f0be782e24e39cca249c5 (diff) | |
| parent | fcf39e226ce318ae1e4bc042379aae1ecff560a6 (diff) | |
| download | frameworks_av-e0f440094345e1e7c3836fe29d3fa34d84e43aee.zip frameworks_av-e0f440094345e1e7c3836fe29d3fa34d84e43aee.tar.gz frameworks_av-e0f440094345e1e7c3836fe29d3fa34d84e43aee.tar.bz2 | |
am fcf39e22: am 0f78eabb: fix the build.
* commit 'fcf39e226ce318ae1e4bc042379aae1ecff560a6':
fix the build.
Diffstat (limited to 'services')
| -rw-r--r-- | services/audiopolicy/AudioPolicyManager.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/services/audiopolicy/AudioPolicyManager.cpp b/services/audiopolicy/AudioPolicyManager.cpp index 78ba23d..1631d6c 100644 --- a/services/audiopolicy/AudioPolicyManager.cpp +++ b/services/audiopolicy/AudioPolicyManager.cpp @@ -4031,7 +4031,7 @@ uint32_t AudioPolicyManager::getStrategyForAttr(const audio_attributes_t *attr) if (isInCall()) { return (uint32_t) STRATEGY_PHONE; } - // FALL THROUGH + return (uint32_t) STRATEGY_ACCESSIBILITY; case AUDIO_USAGE_MEDIA: case AUDIO_USAGE_GAME: @@ -4056,13 +4056,6 @@ uint32_t AudioPolicyManager::getStrategyForAttr(const audio_attributes_t *attr) case AUDIO_USAGE_NOTIFICATION_EVENT: return (uint32_t) STRATEGY_SONIFICATION_RESPECTFUL; - case AUDIO_USAGE_ASSISTANCE_ACCESSIBILITY: - if (isStreamActive(AUDIO_STREAM_RING, 0) || - isStreamActive(AUDIO_STREAM_ALARM, 0)) { - return (uint32_t) STRATEGY_SONIFICATION; - } - return (uint32_t) STRATEGY_ACCESSIBILITY; - case AUDIO_USAGE_UNKNOWN: default: return (uint32_t) STRATEGY_MEDIA; |