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

Commit cc2ea165 authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge "Remove unnecessary Tuner weak ref and enhance the Tuner weak ref on... 

Merge "Remove unnecessary Tuner weak ref and enhance the Tuner weak ref on frontend init" into sc-dev
parents 0ea82749 1c7a30af

media/jni/android_media_tv_Tuner.cpp

+13 −7
Original line number Diff line number Diff line
@@ -1237,15 +1237,23 @@ jobject JTuner::openFrontendByHandle(int feHandle) { 
    if (mDemuxClient != NULL) {

        mDemuxClient->setFrontendDataSource(mFeClient);

    }

    sp<FrontendClientCallbackImpl> feClientCb = new FrontendClientCallbackImpl(mObject);

    mFeClient->setCallback(feClientCb);



    JNIEnv *env = AndroidRuntime::getJNIEnv();

    jobject tuner(env->NewLocalRef(mObject));

    if (env->IsSameObject(tuner, nullptr)) {

        ALOGE("openFrontendByHandle"

                "Tuner object has been freed. Failed to open frontend.");

        env->DeleteWeakGlobalRef(mObject);

        return NULL;

    }



    sp<FrontendClientCallbackImpl> feClientCb = new FrontendClientCallbackImpl(mObject);

    mFeClient->setCallback(feClientCb);

    // TODO: add more fields to frontend

    return env->NewObject(

            env->FindClass("android/media/tv/tuner/Tuner$Frontend"),

            gFields.frontendInitID,

            mObject,

            tuner,

            (jint) mFeId);

}
@@ -1793,16 +1801,14 @@ jobject JTuner::openDvr(DvrType type, jlong bufferSize) { 
        dvrObj =

                env->NewObject(

                        env->FindClass("android/media/tv/tuner/dvr/DvrRecorder"),

                        gFields.dvrRecorderInitID,

                        mObject);

                        gFields.dvrRecorderInitID);

        dvrClient->incStrong(dvrObj);

        env->SetLongField(dvrObj, gFields.dvrRecorderContext, (jlong)dvrClient.get());

    } else {

        dvrObj =

                env->NewObject(

                        env->FindClass("android/media/tv/tuner/dvr/DvrPlayback"),

                        gFields.dvrPlaybackInitID,

                        mObject);

                        gFields.dvrPlaybackInitID);

        dvrClient->incStrong(dvrObj);

        env->SetLongField(dvrObj, gFields.dvrPlaybackContext, (jlong)dvrClient.get());

    }