diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2018-09-13 14:26:05 -0700 |
|---|---|---|
| committer | Chih-hung Hsieh <chh@google.com> | 2018-09-21 17:50:41 +0000 |
| commit | 38bdd657aee952ee5f9699fd8ddf4b5e156a3904 (patch) | |
| tree | c9bcf7f7ee92fe5e81a9475ae8364728b105a592 | |
| parent | 48f698163f6853837a98b7b1afe9238ba4de74cb (diff) | |
| download | av-38bdd657aee952ee5f9699fd8ddf4b5e156a3904.tar.gz | |
Suppress implicit-fallthrough warnings in mediarecorder.
Add FALLTHROUGH_INTENDED for clang compiler.
Bug: 112564944
Test: build with global -Wimplicit-fallthrough.
Change-Id: I42918227a55029f46362d448c496012de9ad3670
| -rw-r--r-- | media/libmedia/Android.bp | 1 | ||||
| -rw-r--r-- | media/libmedia/mediarecorder.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp index 1b3a1bea8f..8921b227c9 100644 --- a/media/libmedia/Android.bp +++ b/media/libmedia/Android.bp @@ -3,6 +3,7 @@ cc_library_headers { vendor_available: true, export_include_dirs: ["include"], header_libs:[ + "libbase_headers", "libgui_headers", "libstagefright_headers", "media_plugin_headers", diff --git a/media/libmedia/mediarecorder.cpp b/media/libmedia/mediarecorder.cpp index 721a0438d3..92cfb1c73d 100644 --- a/media/libmedia/mediarecorder.cpp +++ b/media/libmedia/mediarecorder.cpp @@ -20,6 +20,7 @@ #include <inttypes.h> +#include <android-base/macros.h> #include <utils/Log.h> #include <media/mediarecorder.h> #include <binder/IServiceManager.h> @@ -597,7 +598,8 @@ status_t MediaRecorder::reset() if (OK != ret) { return ret; // No need to continue } - } // Intentional fall through + FALLTHROUGH_INTENDED; + } case MEDIA_RECORDER_INITIALIZED: ret = close(); break; |