commit c4b6e8acbbb2c094de1f8210c1a9e8f7e13a5b74
author android-build-team Robot <android-build-team-robot@google.com> Sat Aug 10 23:16:59 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Aug 10 23:16:59 2019 +0000
tree 46fc68a4182b2867498bb2967b102c2af24f33c9
parent 0a8506e9e228b0116b477d85268bf63b79b781d4
parent fa9f127c172497f121735ebdc2d619e8924adc8f

Snap for 5794870 from fa9f127c172497f121735ebdc2d619e8924adc8f to qt-qpr1-release

Change-Id: I10a7b68821cb1cc09473a5f4d58709b9e82b3729

src/com/android/car/radio/service/RadioAppService.java

diff --git a/src/com/android/car/radio/service/RadioAppService.java b/src/com/android/car/radio/service/RadioAppService.java
index bb03488..44342d5 100644
--- a/src/com/android/car/radio/service/RadioAppService.java
+++ b/src/com/android/car/radio/service/RadioAppService.java
@@ -223,7 +223,11 @@
             ProgramSelector sel = mRadioStorage.getRecentlySelected(pt);
             if (sel != null) {
                 Log.i(TAG, "Restoring recently selected program: " + sel);
-                mRadioTuner.tune(sel, tuneCb);
+                try {
+                    mRadioTuner.tune(sel, tuneCb);
+                } catch (IllegalArgumentException | UnsupportedOperationException e) {
+                    Log.e(TAG, "Can't restore recently selected program: " + sel, e);
+                }
                 return;
             }