commit 34056aea2f45149dcbcda09940a8733f83101303
author Elliott Hughes <enh@google.com> Fri Oct 26 21:35:13 2018 -0700
committer android-build-merger <android-build-merger@google.com> Fri Oct 26 21:35:13 2018 -0700
tree 1ad226616e74037c3077aa9ed2a4788ee0e0be44
parent 34eb61ee6d4907016502b10f56bfcc8e08735098
parent f04392c7b9b3575c8d9def34636899581d8f79d6

Merge "C++17 compatibility: `register` is no longer a keyword."
am: f04392c7b9

Change-Id: I32576e14d8fe8c6c785ad1bba7c35dc0ac4ac18e

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;