summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2014-11-25 11:01:34 -0800
committerEric Laurent <elaurent@google.com>2014-11-25 11:01:34 -0800
commit0f78eabb733e1413d7febd00c0bad0f0add02314 (patch)
tree1d1f34324ca995581c4c64c0379fa488f6507547
parent223fd5c9738e9665e495904d37d4632414b68c1e (diff)
downloadframeworks_av-0f78eabb733e1413d7febd00c0bad0f0add02314.zip
frameworks_av-0f78eabb733e1413d7febd00c0bad0f0add02314.tar.gz
frameworks_av-0f78eabb733e1413d7febd00c0bad0f0add02314.tar.bz2
fix the build.
Change-Id: Iab6b65327ae1adbf0b3a6da5a23b8107468f533e
-rw-r--r--services/audiopolicy/AudioPolicyManager.cpp9
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;