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

Commit 3296237d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "mediaplayer2: remove redundant line" into pi-dev

parents 0446336f 334adf0e

media/libmediaplayer2/mediaplayer2.cpp

+3 −2
Original line number Diff line number Diff line
@@ -903,7 +903,6 @@ status_t MediaPlayer2::getPlaybackSettings(AudioPlaybackRate* rate /* nonnull */ 
    if (mPlayer == 0) {

        return INVALID_OPERATION;

    }

    return mPlayer->getPlaybackSettings(rate);

    status_t ret = mPlayer->getPlaybackSettings(rate);

    if (ret == NO_ERROR) {

        ALOGV("getPlaybackSettings(%f, %f, %d, %d)",
@@ -925,7 +924,9 @@ status_t MediaPlayer2::setSyncSettings(const AVSyncSettings& sync, float videoFp 
status_t MediaPlayer2::getSyncSettings(

        AVSyncSettings* sync /* nonnull */, float* videoFps /* nonnull */) {

    Mutex::Autolock _l(mLock);

    if (mPlayer == 0) return INVALID_OPERATION;

    if (mPlayer == 0) {

        return INVALID_OPERATION;

    }

    status_t ret = mPlayer->getSyncSettings(sync, videoFps);

    if (ret == NO_ERROR) {

        ALOGV("getSyncSettings(%u, %u, %f, %f)",