Merge "Catch IllegalArgumentException when disconnect" into oc-mr1-dev (1d66ccde) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Original line	Diff line number	Diff line
	@@ -256,7 +256,13 @@ public final class MediaBrowser {
	*/		*/
	private void forceCloseConnection() {		private void forceCloseConnection() {
	if (mServiceConnection != null) {		if (mServiceConnection != null) {
			try {
	mContext.unbindService(mServiceConnection);		mContext.unbindService(mServiceConnection);
			} catch (IllegalArgumentException e) {
			if (DBG) {
			Log.d(TAG, "unbindService failed", e);
			}
			}
	}		}
	mState = CONNECT_STATE_DISCONNECTED;		mState = CONNECT_STATE_DISCONNECTED;
	mServiceConnection = null;		mServiceConnection = null;