Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev

am: 1d66ccde36 Change-Id: I2db7c5b73f6b4af128dda75150f7bd2ebeeb653c
2017-08-04 00:37:19 +00:00
parent 57cf99b969 1d66ccde36
commit f6791675f2
1 changed files with 7 additions and 1 deletions
--- a/media/java/android/media/browse/MediaBrowser.java
+++ b/media/java/android/media/browse/MediaBrowser.java
@@ -256,7 +256,13 @@ public final class MediaBrowser {
     */
    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;