Merge "annotate intentional fallthroughs in switch()"
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index e841567..fa9ab1f7 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -81,9 +81,6 @@
"-Wno-error=deprecated-declarations",
"-Wunused",
"-Wunreachable-code",
- // Allow implicit fallthroughs in android_media_MediaScanner.cpp and
- // android_mtp_MtpDatabase.cpp until they are fixed.
- "-Wno-error=implicit-fallthrough",
],
}
diff --git a/media/jni/android_media_MediaScanner.cpp b/media/jni/android_media_MediaScanner.cpp
index c0ceb01..58044c0 100644
--- a/media/jni/android_media_MediaScanner.cpp
+++ b/media/jni/android_media_MediaScanner.cpp
@@ -27,6 +27,7 @@
#include <nativehelper/JNIHelp.h>
#include "android_runtime/AndroidRuntime.h"
#include "android_runtime/Log.h"
+#include <android-base/macros.h> // for FALLTHROUGH_INTENDED
using namespace android;
@@ -92,6 +93,7 @@
return false;
}
// Fall through to take care of the final byte.
+ FALLTHROUGH_INTENDED;
case 0x0c:
case 0x0d:
// Bit pattern 110x, so there is one additional byte.
diff --git a/media/jni/android_mtp_MtpDatabase.cpp b/media/jni/android_mtp_MtpDatabase.cpp
index 4d8c96f..56b85b5 100644
--- a/media/jni/android_mtp_MtpDatabase.cpp
+++ b/media/jni/android_mtp_MtpDatabase.cpp
@@ -1272,6 +1272,7 @@
case MTP_DEVICE_PROPERTY_DEVICE_FRIENDLY_NAME:
writable = true;
// fall through
+ FALLTHROUGH_INTENDED;
case MTP_DEVICE_PROPERTY_IMAGE_SIZE:
{
result = new MtpProperty(property, MTP_TYPE_STR, writable);