Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1e48aa3 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "audio: fix switch to break or use FALLTHROUGH_INTENDED"

parents 1b4c18d7 320fd852

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -1751,15 +1751,14 @@ int Reverb_getParameter(ReverbContext *pContext, 
            //        *(int16_t *)pValue);

            //        *(int16_t *)pValue);

            break;

            break;

        case REVERB_PARAM_DENSITY:

        case REVERB_PARAM_DENSITY:

            *(uint16_t *)pValue = 0;

            *(int16_t *)pValue = ReverbGetDensity(pContext);

            *(int16_t *)pValue = ReverbGetDensity(pContext);

            //ALOGV("\tReverb_getParameter() REVERB_PARAM_DENSITY Value is %d",

            //ALOGV("\tReverb_getParameter() REVERB_PARAM_DENSITY Value is %d",

            //        *(uint32_t *)pValue);

            //        *(uint32_t *)pValue);

            break;

            break;

        case REVERB_PARAM_REFLECTIONS_LEVEL:

        case REVERB_PARAM_REFLECTIONS_LEVEL:

            *(uint16_t *)pValue = 0;

            *(uint16_t *)pValue = 0;

            break;

        case REVERB_PARAM_REFLECTIONS_DELAY:

        case REVERB_PARAM_REFLECTIONS_DELAY:

            *(uint32_t *)pValue = 0;

        case REVERB_PARAM_REVERB_DELAY:

        case REVERB_PARAM_REVERB_DELAY:

            *(uint32_t *)pValue = 0;

            *(uint32_t *)pValue = 0;

            break;

            break;

media/libeffects/preprocessing/PreProcessing.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -698,6 +698,7 @@ int Effect_SetState(preproc_effect_t *effect, uint32_t state) 
        case PREPROC_EFFECT_STATE_ACTIVE:

        case PREPROC_EFFECT_STATE_ACTIVE:

            effect->ops->disable(effect);

            effect->ops->disable(effect);

            Session_SetProcEnabled(effect->session, effect->procId, false);

            Session_SetProcEnabled(effect->session, effect->procId, false);

            break;

        case PREPROC_EFFECT_STATE_CONFIG:

        case PREPROC_EFFECT_STATE_CONFIG:

        case PREPROC_EFFECT_STATE_CREATED:

        case PREPROC_EFFECT_STATE_CREATED:

        case PREPROC_EFFECT_STATE_INIT:

        case PREPROC_EFFECT_STATE_INIT:

media/libnblog/Merger.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -188,6 +188,7 @@ void MergeReader::processSnapshot(Snapshot &snapshot, int author) 
        case EVENT_RESERVED:

        case EVENT_RESERVED:

        case EVENT_UPPER_BOUND:

        case EVENT_UPPER_BOUND:

            ALOGW("warning: unexpected event %d", it->type);

            ALOGW("warning: unexpected event %d", it->type);

            break;

        default:

        default:

            break;

            break;

        }

        }

media/libnblog/Reader.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -269,6 +269,7 @@ void DumpReader::dump(int fd, size_t indent) 
        case EVENT_RESERVED:

        case EVENT_RESERVED:

        case EVENT_UPPER_BOUND:

        case EVENT_UPPER_BOUND:

            body.appendFormat("warning: unexpected event %d", it->type);

            body.appendFormat("warning: unexpected event %d", it->type);

            break;

        default:

        default:

            break;

            break;

        }

        }

services/audiopolicy/enginedefault/src/Engine.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -186,6 +186,7 @@ routing_strategy Engine::getStrategyForStream(audio_stream_type_t stream) 
        return STRATEGY_DTMF;

        return STRATEGY_DTMF;

    default:

    default:

        ALOGE("unknown stream type %d", stream);

        ALOGE("unknown stream type %d", stream);

        FALLTHROUGH_INTENDED;

    case AUDIO_STREAM_SYSTEM:

    case AUDIO_STREAM_SYSTEM:

        // NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs

        // NOTE: SYSTEM stream uses MEDIA strategy because muting music and switching outputs

        // while key clicks are played produces a poor result

        // while key clicks are played produces a poor result