diff options
| author | Tomasz Wasilczyk <twasilczyk@google.com> | 2019-08-08 11:27:19 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-08-08 11:27:19 -0700 |
| commit | 8f892421d0f7b899e575886e785db5b57a49fa8c (patch) | |
| tree | 5f016c08a9ce4bddd76dc6713e9512fec8cefd7f /core/java | |
| parent | 9e32d76a2f5b18d229b15f64d6cc230a32860a6e (diff) | |
| parent | 48d3b7ce3e8a2ccd3465446db3dbb70f85de6049 (diff) | |
Merge "Don't crash trying to stop program list updates on already closed tuner" into qt-qpr1-dev
am: 48d3b7ce3e
Change-Id: I83d55ad34a1a5bbe977df97d2a3a4ce87780ccaf
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/hardware/radio/TunerAdapter.java | 2 |
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); } |