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

Commit 1e02ed82 authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh Committed by android-build-merger
Browse files

Merge "Fix implicit fallthrough warnings." am: 50c56733 

am: eccb7a7e

Change-Id: Ica7344d24dd8b847dc936d1973ccbf4ff5a5185f
parents 10cfacf0 eccb7a7e

media/libaudioprocessing/tests/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ LOCAL_C_INCLUDES := \ 
LOCAL_SRC_FILES := \

    resampler_tests.cpp



LOCAL_HEADER_LIBRARIES := libbase_headers



LOCAL_MODULE := resampler_tests



LOCAL_MODULE_TAGS := tests
@@ -49,6 +51,8 @@ LOCAL_SHARED_LIBRARIES := \ 
    liblog \

    libutils \



LOCAL_HEADER_LIBRARIES := libbase_headers



LOCAL_MODULE := test-mixer



LOCAL_MODULE_TAGS := optional

media/libaudioprocessing/tests/test_utils.h

+3 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 


#include <log/log.h>



#include <android-base/macros.h>

#include <audio_utils/sndfile.h>



#ifndef ARRAY_SIZE
@@ -77,14 +78,14 @@ static inline int parseCSV(const char *string, std::vector<int>& values) 
                }

                return numValues;

            }

            // fall through

            FALLTHROUGH_INTENDED;

        case ',':

            if (hadDigit) {

                hadDigit = false;

                numValues++;

                break;

            }

            // fall through

            FALLTHROUGH_INTENDED;

        default:

            return -1;

        }