Merge "Support multiple calls to AsyncChannel.disconnect" (140d2d3e) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/util/AsyncChannel.java

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -450,6 +450,7 @@ public class AsyncChannel {
	public void disconnect() {		public void disconnect() {
	if ((mConnection != null) && (mSrcContext != null)) {		if ((mConnection != null) && (mSrcContext != null)) {
	mSrcContext.unbindService(mConnection);		mSrcContext.unbindService(mConnection);
			mConnection = null;
	}		}
	try {		try {
	// Send the DISCONNECTED, although it may not be received		// Send the DISCONNECTED, although it may not be received
	@@ -463,10 +464,12 @@ public class AsyncChannel {
	// Tell source we're disconnected.		// Tell source we're disconnected.
	if (mSrcHandler != null) {		if (mSrcHandler != null) {
	replyDisconnected(STATUS_SUCCESSFUL);		replyDisconnected(STATUS_SUCCESSFUL);
			mSrcHandler = null;
	}		}
	// Unlink only when bindService isn't used		// Unlink only when bindService isn't used
	if (mConnection == null && mDstMessenger != null && mDeathMonitor!= null) {		if (mConnection == null && mDstMessenger != null && mDeathMonitor!= null) {
	mDstMessenger.getBinder().unlinkToDeath(mDeathMonitor, 0);		mDstMessenger.getBinder().unlinkToDeath(mDeathMonitor, 0);
			mDeathMonitor = null;
	}		}
	}		}