Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e864fa2 authored by Henry Fang's avatar Henry Fang Committed by Automerger Merge Worker
Browse files

Merge "catch null exception for filter event" into udc-dev am: 6a04bafa 

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



Change-Id: I21aced1416a16d1c2617bd5336b8df65398612a9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9b2ea1d5 6a04bafa

media/java/android/media/tv/tuner/filter/Filter.java

+13 −2
Original line number Diff line number Diff line
@@ -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,8 +272,13 @@ public class Filter implements AutoCloseable { 
                mExecutor.execute(() -> {

                    synchronized (mCallbackLock) {

                        if (mCallback != null) {

                            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) {

                            try {

                                mCallback.onFilterEvent(this, events);

                            }

                            catch (NullPointerException e) {

                                Log.d(TAG, "catch exception:" + e);

                            }

                        } else {

                            for (FilterEvent event : events) {

                                if (event instanceof MediaEvent) {