From 93b3dd7fb0d84ba98b2c83026f84b3e1a1e2fdad Mon Sep 17 00:00:00 2001 From: Amy Zhang Date: Fri, 9 Apr 2021 09:51:56 -0700 Subject: Allow Descrambler.add/removePid to pass a nullable optional filter Test: make Bug: 184851519 Change-Id: I5457150579e57cc2c39a3bd390bbef62de73520b Merged-In: Icf7d9526fa15dc11b23e9f73dbfceee748640772 --- media/jni/android_media_tv_Tuner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index 3976086ea495..49ef504f6b03 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -3258,7 +3258,7 @@ static jint android_media_tv_Tuner_descrambler_add_pid( if (descramblerSp == NULL) { return (jint) Result::NOT_INITIALIZED; } - sp iFilterSp = getFilter(env, filter)->getIFilter(); + sp 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 iFilterSp = getFilter(env, filter)->getIFilter(); + sp iFilterSp = (filter == NULL) ? NULL : getFilter(env, filter)->getIFilter(); Result result = descramblerSp->removePid(getDemuxPid((int)pidType, (int)pid), iFilterSp); return (jint) result; } -- cgit v1.2.3-59-g8ed1b