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

Commit b71ede13 authored by Dichen Zhang's avatar Dichen Zhang
Browse files

Revert "Fix memory leaks" 

This reverts commit 39f4bc12.

Reason for revert: not the right fix

Change-Id: I6b6150f6a7c0df6517406a4c385b153fec839c3a
parent 39f4bc12

media/libmediaplayer2/MediaPlayer2AudioOutput.cpp

+5 −8
Original line number Diff line number Diff line
@@ -521,15 +521,12 @@ jobject MediaPlayer2AudioOutput::getRoutedDevice() { 
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);