summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorTomasz Wasilczyk <twasilczyk@google.com>2019-08-07 12:57:00 -0700
committerTomasz Wasilczyk <twasilczyk@google.com>2019-08-08 15:19:48 +0000
commit06e534a3fb7b0435c292f04f26469997dfaa4d02 (patch)
tree369f3b4d3c61d73ff98e98e8581cde7c3ee88977 /core/java
parent2233164086973cdc79aebc73972ab78397c85824 (diff)
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)
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/hardware/radio/TunerAdapter.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/hardware/radio/TunerAdapter.java b/core/java/android/hardware/radio/TunerAdapter.java
index be2846f87079..aa5480abafb4 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);
}