commit fa9f127c172497f121735ebdc2d619e8924adc8f
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Aug 07 13:29:55 2019 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Aug 08 15:16:39 2019 +0000
tree 46fc68a4182b2867498bb2967b102c2af24f33c9
parent 739c32bfaf962c33085595df1e45924344faa056

Don't crash trying to restore invalid program

Bug: 135443669
Test: mock invalid ProgramInfo, build, run
Change-Id: Ia434cfc6183c06b0a33fa9b305d81a1eb816e8e7
(cherry picked from commit 1bfcc0bd3e5c275a7e64384da097ed0a7c7c4b0f)

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;
             }