Revert "Fix memory leaks"
This reverts commit 39f4bc12d049acec9bf8a665f362b8a18ad14f6f.
Reason for revert: not the right fix
Change-Id: I6b6150f6a7c0df6517406a4c385b153fec839c3a
diff --git a/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp b/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp
index c1bfa25..7c3063d 100644
--- a/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp
+++ b/media/libmediaplayer2/MediaPlayer2AudioOutput.cpp
@@ -521,15 +521,12 @@
status_t MediaPlayer2AudioOutput::addAudioDeviceCallback(jobject jRoutingDelegate) {
ALOGV("addAudioDeviceCallback");
Mutex::Autolock lock(mLock);
-
- JObjectHolder listenerHolder{JAudioTrack::getListener(jRoutingDelegate)};
- jobject listener = listenerHolder.getJObject();
+ jobject listener = (new JObjectHolder(
+ JAudioTrack::getListener(jRoutingDelegate)))->getJObject();
if (JAudioTrack::findByKey(mRoutingDelegates, listener) == nullptr) {
- JObjectHolder handlerHolder{JAudioTrack::getHandler(jRoutingDelegate)};
- jobject handler = handlerHolder.getJObject();
-
- JObjectHolder routingDelegateHolder = JObjectHolder(jRoutingDelegate);
- jobject routingDelegate = routingDelegateHolder.getJObject();
+ jobject handler = (new JObjectHolder(
+ JAudioTrack::getHandler(jRoutingDelegate)))->getJObject();
+ jobject routingDelegate = (new JObjectHolder(jRoutingDelegate))->getJObject();
mRoutingDelegates.push_back(std::pair<jobject, jobject>(listener, routingDelegate));
if (mJAudioTrack != nullptr) {
return mJAudioTrack->addAudioDeviceCallback(routingDelegate, handler);