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

Commit 012a4243 authored by Amy Zhang's avatar Amy Zhang Committed by Automerger Merge Worker
Browse files

Merge "Allow Descrambler.add/removePid to pass a nullable optional filter" am: 0b8ff8e0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1672265

Change-Id: Ifdbe40af2a6e8e6b70ad9689a819e4c5b793a978
parents 69814e45 0b8ff8e0

media/jni/android_media_tv_Tuner.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3258,7 +3258,7 @@ static jint android_media_tv_Tuner_descrambler_add_pid( 
    if (descramblerSp == NULL) {

        return (jint) Result::NOT_INITIALIZED;

    }

    sp<IFilter> iFilterSp = getFilter(env, filter)->getIFilter();

    sp<IFilter> iFilterSp = (filter == NULL) ? NULL : getFilter(env, filter)->getIFilter();

    Result result = descramblerSp->addPid(getDemuxPid((int)pidType, (int)pid), iFilterSp);

    return (jint) result;

}
@@ -3269,7 +3269,7 @@ static jint android_media_tv_Tuner_descrambler_remove_pid( 
    if (descramblerSp == NULL) {

        return (jint) Result::NOT_INITIALIZED;

    }

    sp<IFilter> iFilterSp = getFilter(env, filter)->getIFilter();

    sp<IFilter> iFilterSp = (filter == NULL) ? NULL : getFilter(env, filter)->getIFilter();

    Result result = descramblerSp->removePid(getDemuxPid((int)pidType, (int)pid), iFilterSp);

    return (jint) result;

}