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

Commit 17a4a0fe authored by Chih-hung Hsieh's avatar Chih-hung Hsieh Committed by android-build-merger
Browse files

Merge "Suppress implicit-fallthrough warnings in audioflinger etc." am: a494bb15 am: 8662f3b9 

am: d06ae78e

Change-Id: Iee095b6e1278d372b3a7c171f926bd730dbc388b
parents bd9b5935 d06ae78e

media/libaudioprocessing/tests/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libutils \



LOCAL_HEADER_LIBRARIES := libbase_headers



LOCAL_MODULE := test-resampler



LOCAL_MODULE_TAGS := optional

media/libaudioprocessing/tests/test-resampler.cpp

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <math.h>

#include <audio_utils/primitives.h>

#include <audio_utils/sndfile.h>

#include <android-base/macros.h>

#include <utils/Vector.h>

#include <media/AudioBufferProvider.h>

#include <media/AudioResampler.h>
@@ -87,14 +88,14 @@ int parseCSV(const char *string, Vector<int>& values) 
                }

                return numValues;

            }

            // fall through

            FALLTHROUGH_INTENDED;

        case ',':

            if (hadDigit) {

                hadDigit = false;

                numValues++;

                break;

            }

            // fall through

            FALLTHROUGH_INTENDED;

        default:

            return -1;

        }

services/audioflinger/Effects.cpp

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ bool AudioFlinger::EffectModule::updateState() { 
    switch (mState) {

    case RESTART:

        reset_l();

        // FALL THROUGH

        FALLTHROUGH_INTENDED;



    case STARTING:

        // clear auxiliary effect input buffer for next accumulation

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -4487,7 +4487,7 @@ AudioFlinger::PlaybackThread::mixer_state AudioFlinger::MixerThread::prepareTrac 
                    isActive = false;

                    break;

                }

                // fall through

                FALLTHROUGH_INTENDED;

            case TrackBase::STOPPING_2:

            case TrackBase::PAUSED:

            case TrackBase::STOPPED:

services/audioflinger/Tracks.cpp

+1 −1
Original line number Diff line number Diff line
@@ -857,7 +857,7 @@ void AudioFlinger::PlaybackThread::Track::pause() 


            // Offloaded track was draining, we need to carry on draining when resumed

            mResumeToStopping = true;

            // fall through...

            FALLTHROUGH_INTENDED;

        case ACTIVE:

        case RESUMING:

            mState = PAUSING;