Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Allow Descrambler.add/removePid to pass a nullable optional filter"

Browse Source
This commit is contained in:
Amy Zhang
2021-04-13 02:59:06 +00:00
committed by Gerrit Code Review
parent 5d41bf1b65 93b3dd7fb0
commit 0b8ff8e00e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media/jni/android_media_tv_Tuner.cpp
View File

@@ -3258,7 +3258,7 @@ static jint android_media_tv_Tuner_descrambler_add_pid(
if (descramblerSp == NULL) { if (descramblerSp == NULL) {
return (jint) Result::NOT_INITIALIZED; 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); Result result = descramblerSp->addPid(getDemuxPid((int)pidType, (int)pid), iFilterSp);
return (jint) result; return (jint) result;
} }
@@ -3269,7 +3269,7 @@ static jint android_media_tv_Tuner_descrambler_remove_pid(
if (descramblerSp == NULL) { if (descramblerSp == NULL) {
return (jint) Result::NOT_INITIALIZED; 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); Result result = descramblerSp->removePid(getDemuxPid((int)pidType, (int)pid), iFilterSp);
return (jint) result; return (jint) result;
} }