commit c012f6edd817924fbc97558f7bf957143a5f3b90
author Sungsoo Lim <sungsoo@google.com> Thu Aug 03 14:01:57 2017 +0900
committer Sungsoo Lim <sungsoo@google.com> Thu Aug 03 14:38:36 2017 +0900
tree fcba09157912475d50530a617c2c1529f5afd2e0
parent fca9a47ba86163defeb100a75fc856be6c1f3159

Catch IllegalArgumentException when disconnect

IllegalArgumentException can happen, if unbindService() is called
after the service is stopped.

Bug: 63439915
Test: Passed MediaBrowserTest
Change-Id: I70ecb9e907af66b9b65960dd4029e55e81639c03

media/java/android/media/browse/MediaBrowser.java

diff --git a/media/java/android/media/browse/MediaBrowser.java b/media/java/android/media/browse/MediaBrowser.java
index ece19e4..3d3fcb9 100644
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -256,7 +256,13 @@
      */
     private void forceCloseConnection() {
         if (mServiceConnection != null) {
-            mContext.unbindService(mServiceConnection);
+            try {
+                mContext.unbindService(mServiceConnection);
+            } catch (IllegalArgumentException e) {
+                if (DBG) {
+                    Log.d(TAG, "unbindService failed", e);
+                }
+            }
         }
         mState = CONNECT_STATE_DISCONNECTED;
         mServiceConnection = null;