Merge "Revert "Fix memory leaks""

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);