From a92470c72fb51f8f1445fbb0f246c197aeb1dd5e Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Thu, 20 May 2021 06:29:32 +1000 Subject: [PATCH] DO NOT MERGE ANYWHERE: Do nullptr check on source filter Bug: 189129262 Change-Id: I57bcddb276f1f56d6523499bade6abc6fc7e7732 Merged-In: Id7e89a17480884b5faa63e755b98faf0b9e91365 --- media/jni/android_media_tv_Tuner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/jni/android_media_tv_Tuner.cpp b/media/jni/android_media_tv_Tuner.cpp index 49ef504f6b034..f7b0fb581fd3d 100644 --- a/media/jni/android_media_tv_Tuner.cpp +++ b/media/jni/android_media_tv_Tuner.cpp @@ -3094,7 +3094,7 @@ static jint android_media_tv_Tuner_set_filter_data_source( r = iFilterSp->setDataSource(NULL); } else { sp srcSp = getFilter(env, srcFilter)->getIFilter(); - if (iFilterSp == NULL) { + if (srcSp == NULL) { ALOGD("Failed to set filter data source: src filter not found"); return (jint) Result::INVALID_ARGUMENT; }