commit 90573b329ef7c448b9d1584e5fd31c02c382de3b
author Tomasz Wasilczyk <twasilczyk@google.com> Wed Aug 07 11:37:53 2019 -0700
committer Tomasz Wasilczyk <twasilczyk@google.com> Wed Aug 07 11:39:49 2019 -0700
tree 64229de83fc7f993d3e3194093853d218f1e2a21
parent 20acc04391f1087f53002c4046338c7dbcc0abba

Don't crash when unbinding from disconnected service.

Bug: 131853728
Test: build and run the app
Change-Id: Ie7c1666e9b96644403a2047798bf39eb9dace1ef

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

diff --git a/src/com/android/car/radio/service/RadioAppServiceWrapper.java b/src/com/android/car/radio/service/RadioAppServiceWrapper.java
index 90b9ac0..504c8cf 100644
--- a/src/com/android/car/radio/service/RadioAppServiceWrapper.java
+++ b/src/com/android/car/radio/service/RadioAppServiceWrapper.java
@@ -201,7 +201,9 @@
             throw new IllegalStateException(
                     "This is not a remote service wrapper, you can't unbind it");
         }
-        callService(service -> service.removeCallback(mCallback));
+        try {
+            callService(service -> service.removeCallback(mCallback));
+        } catch (IllegalStateException e) { }  // it's fine if the service is not connected
         mClientContext.unbindService(mServiceConnection);
     }