From 06e534a3fb7b0435c292f04f26469997dfaa4d02 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Wed, 7 Aug 2019 12:57:00 -0700
Subject: [PATCH] Don't crash trying to stop program list updates on already
 closed tuner

Bug: 130816005
Test: build and run
Change-Id: Ibb0af40165c6b330785ef208510ba654c5ee6ad7
(cherry picked from commit 136870f7f122449c20cfdd8bb6418f6c146ee990)
---
 core/java/android/hardware/radio/TunerAdapter.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/java/android/hardware/radio/TunerAdapter.java b/core/java/android/hardware/radio/TunerAdapter.java
index be2846f870799..aa5480abafb4b 100644
--- 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);
                 }