Merge "catch null exception for filter event" into udc-dev
diff --git a/media/java/android/media/tv/tuner/filter/Filter.java b/media/java/android/media/tv/tuner/filter/Filter.java
index 7e9443b..c39a6db 100644
--- a/media/java/android/media/tv/tuner/filter/Filter.java
+++ b/media/java/android/media/tv/tuner/filter/Filter.java
@@ -32,6 +32,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
+import java.lang.NullPointerException;
import java.util.concurrent.Executor;
/**
@@ -271,7 +272,12 @@
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 @@
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) {