Merge "Ensure Telecom ServiceBinder class unlinks death recipient." into pi-dev (751673a6) · Commits · e / os / android_packages_services_Telecomm

src/com/android/server/telecom/ServiceBinder.java

+17 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,7 @@ abstract class ServiceBinder {
		mIsBindingAborted = true;
		} else {
		logServiceDisconnected("unbind");
		unlinkDeathRecipient();
		mContext.unbindService(mServiceConnection);
		mServiceConnection = null;
		setBinder(null);
		@@ -371,9 +372,25 @@ abstract class ServiceBinder {
		* Handles a service disconnection.
		*/
		private void handleServiceDisconnected() {
		unlinkDeathRecipient();
		setBinder(null);
		}

		/**
		* Handles un-linking the death recipient from the service's binder.
		*/
		private void unlinkDeathRecipient() {
		if (mServiceDeathRecipient != null && mBinder != null) {
		boolean unlinked = mBinder.unlinkToDeath(mServiceDeathRecipient, 0);
		if (!unlinked) {
		Log.i(this, "unlinkDeathRecipient: failed to unlink %s", mComponentName);
		}
		mServiceDeathRecipient = null;
		} else {
		Log.w(this, "unlinkDeathRecipient: death recipient is null.");
		}
		}

		private void clearAbort() {
		mIsBindingAborted = false;
		}