Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6791675 authored by Sungsoo Lim's avatar Sungsoo Lim Committed by android-build-merger
Browse files

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

am: 1d66ccde

Change-Id: I2db7c5b73f6b4af128dda75150f7bd2ebeeb653c
parents 57cf99b9 1d66ccde

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

+7 −1
Original line number Diff line number Diff line
@@ -256,7 +256,13 @@ public final class MediaBrowser { 
     */

    private void forceCloseConnection() {

        if (mServiceConnection != null) {

            try {

                mContext.unbindService(mServiceConnection);

            } catch (IllegalArgumentException e) {

                if (DBG) {

                    Log.d(TAG, "unbindService failed", e);

                }

            }

        }

        mState = CONNECT_STATE_DISCONNECTED;

        mServiceConnection = null;