commit 3296237d65bf169b2cd113eeedd985885306f796
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Mar 23 23:07:12 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 23 23:07:12 2018 +0000
tree 6bc615c7bb10241052e8654277ca04e3998fbd2c
parent 0446336ff3d2dba09e3ca0a84f45dc0df4fbbef5
parent 334adf0ea8a9a5f6e26168864d4fd73a5c9417eb

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

media/libmediaplayer2/mediaplayer2.cpp

diff --git a/media/libmediaplayer2/mediaplayer2.cpp b/media/libmediaplayer2/mediaplayer2.cpp
index 9e96a2b..e5567dc 100644
--- a/media/libmediaplayer2/mediaplayer2.cpp
+++ b/media/libmediaplayer2/mediaplayer2.cpp
@@ -903,7 +903,6 @@
     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::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)",