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

Merge "catch null exception for filter event" into udc-dev

Browse Source
This commit is contained in:
Henry Fang
2023-03-06 22:22:32 +00:00
committed by Android (Google) Code Review
parent 3d2226d210 d3d570acde
commit 6a04bafaee
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
media/java/android/media/tv/tuner/filter/Filter.java
View File

@@ -32,6 +32,7 @@ import android.util.Log;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.NullPointerException;
import java.util.concurrent.Executor;
/**
@@ -271,7 +272,12 @@ public class Filter implements AutoCloseable {
mExecutor.execute(() -> {
synchronized (mCallbackLock) {
if (mCallback != null) {
mCallback.onFilterStatusChanged(this, status);
try {
mCallback.onFilterStatusChanged(this, status);
}
catch (NullPointerException e) {
Log.d(TAG, "catch exception:" + e);
}
}
}
});
@@ -285,7 +291,12 @@ public class Filter implements AutoCloseable {
mExecutor.execute(() -> {
synchronized (mCallbackLock) {
if (mCallback != null) {
mCallback.onFilterEvent(this, events);
try {
mCallback.onFilterEvent(this, events);
}
catch (NullPointerException e) {
Log.d(TAG, "catch exception:" + e);
}
} else {
for (FilterEvent event : events) {
if (event instanceof MediaEvent) {