commit 1b81e543f84284c324f86bc840d720477d6e2396
author Chong Zhang <chz@google.com> Wed Oct 24 19:25:48 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 19:25:48 2018 -0700
tree 601a089f5944ce126cedf8b4d569083410b27d55
parent 02f5259eb8cb980ede0b7cb23eb8396efb3ac681
parent ddf3c7a1ab0028b6bef1d5c1ecf90f89a23a3bf3

Merge "Add to retrieve color aspects as metadata"
am: ddf3c7a1ab

Change-Id: I55a7093015c8709641d8bb4cf1fe23d1bbaec051

media/libmediaplayer2/nuplayer2/Android.bp

diff --git a/media/libmediaplayer2/nuplayer2/Android.bp b/media/libmediaplayer2/nuplayer2/Android.bp
index 4906a36..c8ddc11 100644
--- a/media/libmediaplayer2/nuplayer2/Android.bp
+++ b/media/libmediaplayer2/nuplayer2/Android.bp
@@ -33,8 +33,6 @@
     cflags: [
         "-Werror",
         "-Wall",
-        // Allow implicit fallthroughs in NuPlayer2Driver.cpp until they are fixed.
-        "-Wno-error=implicit-fallthrough",
     ],
 
     product_variables: {

media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp

diff --git a/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp
index 8eda9b8..bafa653 100644
--- a/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp
+++ b/media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp
@@ -327,7 +327,7 @@
     switch (mState) {
         case STATE_RUNNING:
             mPlayer->pause();
-            [[fallthrough]];
+            // fall through
 
         case STATE_PAUSED:
             mState = STATE_STOPPED;