commit 34eb61ee6d4907016502b10f56bfcc8e08735098
author Chong Zhang <chz@google.com> Wed Oct 24 19:26:23 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Oct 24 19:26:23 2018 -0700
tree fa31ef1a4b8712bbfc70c4568de812ea915e10ff
parent 1b81e543f84284c324f86bc840d720477d6e2396
parent 8ecc7c198cd0901c37af2159fdd1c005b55d108d

Merge "Add color aspects keys"
am: 8ecc7c198c

Change-Id: I368c1c13892cc2af5877f816ba7d5ed05a355910

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;