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

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

Merge "Suppress implicit-fallthrough warnings in mediarecorder." am: fd53bf2f 

am: 5c1de015

Change-Id: I518cb9e4a74c9b7ba335a2bbb6a53b81c7661ca6
parents a2f4d121 5c1de015

media/libmedia/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -3,6 +3,7 @@ cc_library_headers { 
    vendor_available: true,

    vendor_available: true,

    export_include_dirs: ["include"],

    export_include_dirs: ["include"],

    header_libs:[

    header_libs:[

        "libbase_headers",

        "libgui_headers",

        "libgui_headers",

        "libstagefright_headers",

        "libstagefright_headers",

        "media_plugin_headers",

        "media_plugin_headers",

media/libmedia/mediarecorder.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -20,6 +20,7 @@ 




#include <inttypes.h>

#include <inttypes.h>





#include <android-base/macros.h>

#include <utils/Log.h>

#include <utils/Log.h>

#include <media/mediarecorder.h>

#include <media/mediarecorder.h>

#include <binder/IServiceManager.h>

#include <binder/IServiceManager.h>
@@ -597,7 +598,8 @@ status_t MediaRecorder::reset() 
            if (OK != ret) {

            if (OK != ret) {

                return ret;  // No need to continue

                return ret;  // No need to continue

            }

            }

        }  // Intentional fall through

            FALLTHROUGH_INTENDED;

        }

        case MEDIA_RECORDER_INITIALIZED:

        case MEDIA_RECORDER_INITIALIZED:

            ret = close();

            ret = close();

            break;

            break;