commit 0f78eabb733e1413d7febd00c0bad0f0add02314
author Eric Laurent <elaurent@google.com> Tue Nov 25 11:01:34 2014 -0800
committer Eric Laurent <elaurent@google.com> Tue Nov 25 11:01:34 2014 -0800
tree 1d1f34324ca995581c4c64c0379fa488f6507547
parent 223fd5c9738e9665e495904d37d4632414b68c1e

fix the build.

Change-Id: Iab6b65327ae1adbf0b3a6da5a23b8107468f533e

services/audiopolicy/AudioPolicyManager.cpp

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 @@
         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 @@
     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;