Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit daba8f4f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Suppress implicit-fallthrough warnings in nuplayer*."

parents a8fb86eb c89566d5

media/libmediaplayer2/nuplayer2/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ cc_library_static { 
    ],



    header_libs: [

        "libbase_headers",

        "libmediaplayer2_headers",

        "media_plugin_headers",

    ],

media/libmediaplayer2/nuplayer2/NuPlayer2Driver.cpp

+3 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "NuPlayer2Driver"

#include <inttypes.h>

#include <android-base/macros.h>

#include <utils/Log.h>

#include <cutils/properties.h>
@@ -297,8 +298,7 @@ status_t NuPlayer2Driver::start_l() { 
        case STATE_PREPARED:

        {

            mPlayer->start();



            // fall through

            FALLTHROUGH_INTENDED;

        }



        case STATE_RUNNING:
@@ -940,7 +940,7 @@ void NuPlayer2Driver::notifyListener_l( 
                    mPlayer->pause();

                    mState = STATE_PAUSED;

                }

                // fall through

                FALLTHROUGH_INTENDED;

            }



            case MEDIA2_ERROR:

media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp

+5 −4
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "NuPlayerDriver"

#include <inttypes.h>

#include <android-base/macros.h>

#include <utils/Log.h>

#include <cutils/properties.h>
@@ -344,7 +345,7 @@ status_t NuPlayerDriver::start_l() { 


            CHECK_EQ(mState, STATE_PREPARED);



            // fall through

            FALLTHROUGH_INTENDED;

        }



        case STATE_PAUSED:
@@ -353,7 +354,7 @@ status_t NuPlayerDriver::start_l() { 
        {

            mPlayer->start();



            // fall through

            FALLTHROUGH_INTENDED;

        }



        case STATE_RUNNING:
@@ -382,7 +383,7 @@ status_t NuPlayerDriver::stop() { 
    switch (mState) {

        case STATE_RUNNING:

            mPlayer->pause();

            // fall through

            FALLTHROUGH_INTENDED;



        case STATE_PAUSED:

            mState = STATE_STOPPED;
@@ -991,7 +992,7 @@ void NuPlayerDriver::notifyListener_l( 
                mPlayer->pause();

                mState = STATE_PAUSED;

            }

            // fall through

            FALLTHROUGH_INTENDED;

        }



        case MEDIA_ERROR: