Merge "audio: fix switch to break or use FALLTHROUGH_INTENDED" am: 599f3305dc

am: 6e97e80782

Change-Id: Iabe50e2862e3b667763b6d868764465c915fb818

media/libeffects/lvm/wrapper/Reverb/EffectReverb.cpp

@@ -1751,15 +1751,14 @@ int Reverb_getParameter(ReverbContext *pContext,
             //        *(int16_t *)pValue);
             break;
         case REVERB_PARAM_DENSITY:
-            *(uint16_t *)pValue = 0;
             *(int16_t *)pValue = ReverbGetDensity(pContext);
             //ALOGV("\tReverb_getParameter() REVERB_PARAM_DENSITY Value is %d",
             //        *(uint32_t *)pValue);
             break;
         case REVERB_PARAM_REFLECTIONS_LEVEL:
             *(uint16_t *)pValue = 0;
+            break;
         case REVERB_PARAM_REFLECTIONS_DELAY:
-            *(uint32_t *)pValue = 0;
         case REVERB_PARAM_REVERB_DELAY:
             *(uint32_t *)pValue = 0;
             break;

media/libeffects/preprocessing/PreProcessing.cpp

@@ -698,6 +698,7 @@ int Effect_SetState(preproc_effect_t *effect, uint32_t state)
         case PREPROC_EFFECT_STATE_ACTIVE:
             effect->ops->disable(effect);
             Session_SetProcEnabled(effect->session, effect->procId, false);
+            break;
         case PREPROC_EFFECT_STATE_CONFIG:
         case PREPROC_EFFECT_STATE_CREATED:
         case PREPROC_EFFECT_STATE_INIT:

services/audiopolicy/enginedefault/src/Engine.cpp

@@ -186,6 +186,7 @@ routing_strategy Engine::getStrategyForStream(audio_stream_type_t stream)
         return STRATEGY_DTMF;
     default:
         ALOGE("unknown stream type %d", stream);
+        FALLTHROUGH_INTENDED;
     case AUDIO_STREAM_SYSTEM:
         // NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs
         // while key clicks are played produces a poor result

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

@@ -6076,6 +6076,7 @@ void AudioPolicyManager::filterSurroundFormats(FormatVector *formatsPtr) {
                     case AUDIO_FORMAT_DOLBY_TRUEHD:
                     case AUDIO_FORMAT_E_AC3_JOC:
                         mSurroundFormats.insert(format);
+                        break;
                     default:
                         break;
                 }