commit fbc6186887360a8b2169fbc9979b8f69a50080c5
author Dongwon Kang <dwkang@google.com> Thu Nov 15 02:02:38 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Nov 15 02:02:38 2018 +0000
tree ccc2ed8afa207abd5d0c5da1def985e0d43a6abf
parent 0afd92bad77b98b831e1c26a1d4000c5d3e6e3c5
parent 203b0533f82b75105e7b8ab2c68c3663397069fe

Merge "Fix MediaPlayer2AudioOutput::setAudioAttributes()"

media/libmediaplayer2/MediaPlayer2AudioOutput.cpp

diff --git a/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp b/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp
index 3040c2d..7457d84 100644
--- a/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp
+++ b/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp
@@ -243,9 +243,7 @@
 
 void MediaPlayer2AudioOutput::setAudioAttributes(const jobject attributes) {
     Mutex::Autolock lock(mLock);
-    if (attributes != nullptr) {
-        sp<JObjectHolder> x = new JObjectHolder(attributes);
-    }
+    mAttributes = (attributes == nullptr) ? nullptr : new JObjectHolder(attributes);
 }
 
 audio_stream_type_t MediaPlayer2AudioOutput::getAudioStreamType() const {