commit 012a4243cdc8487472e64d36d1d95684a73fbab7
author Amy Zhang <amyjojo@google.com> Tue Apr 13 03:17:31 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 13 03:17:31 2021 +0000
tree 3e1aa1dace9a57ca6a3687f930e17fa7983acd49
parent 69814e45a1a8f1e178392e6e8af9b21f77e71d0c
parent 0b8ff8e00e8b1e2a86262743ae728d3cfafbfe1c

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

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

Change-Id: Ifdbe40af2a6e8e6b70ad9689a819e4c5b793a978

media/jni/android_media_tv_Tuner.cpp

diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp
index 3976086e..49ef504 100644
--- a/media/jni/android_media_tv_Tuner.cpp
+++ b/media/jni/android_media_tv_Tuner.cpp
@@ -3258,7 +3258,7 @@
     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 @@
     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;
 }