Merge "Don't crash trying to stop program list updates on already closed tuner"

2019-08-07 23:08:25 +00:00
parent 9947052d8d 136870f7f1
commit 0b31d6c000
1 changed files with 2 additions and 0 deletions
--- a/core/java/android/hardware/radio/TunerAdapter.java
+++ b/core/java/android/hardware/radio/TunerAdapter.java
@@ -271,6 +271,8 @@ class TunerAdapter extends RadioTuner {
            mCallback.setProgramListObserver(list, () -> {
                try {
                    mTuner.stopProgramListUpdates();
+                } catch (IllegalStateException ex) {
+                    // it's fine to not stop updates if tuner is already closed
                } catch (RemoteException ex) {
                    Log.e(TAG, "Couldn't stop program list updates", ex);
                }