summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tomasz Wasilczyk <twasilczyk@google.com> 2019-08-07 12:57:00 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> 2019-08-07 12:57:00 -0700
commit136870f7f122449c20cfdd8bb6418f6c146ee990 (patch)
tree6c58937ac6d7ddadc852a7157396d9e9a002e43d
parent774da7799df8a5c88119215ef9e4debbdf6a23fa (diff)
Don't crash trying to stop program list updates on already closed tuner
Bug: 130816005 Test: build and run Change-Id: Ibb0af40165c6b330785ef208510ba654c5ee6ad7
-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);
}