Remove InCallService after incallservice disconnected am: d733a73a8d (8168b680) · Commits · e / os / android_packages_services_Telecomm

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

+6 −5

Original line number	Diff line number	Diff line
		@@ -287,7 +287,7 @@ public class InCallController extends CallsManagerListenerBase {
		}

		protected void onDisconnected() {
		InCallController.this.onDisconnected(mInCallServiceInfo.getComponentName());
		InCallController.this.onDisconnected(mInCallServiceInfo);
		disconnect(); // Unbind explicitly if we get disconnected.
		if (mListener != null) {
		mListener.onDisconnect(InCallServiceBindingConnection.this);
		@@ -1026,6 +1026,7 @@ public class InCallController extends CallsManagerListenerBase {
		mNonUIInCallServiceConnections.disconnect();
		mNonUIInCallServiceConnections = null;
		}
		mInCallServices.clear();
		}

		/**
		@@ -1319,12 +1320,12 @@ public class InCallController extends CallsManagerListenerBase {
		/**
		* Cleans up an instance of in-call app after the service has been unbound.
		*
		* @param disconnectedComponent The {@link ComponentName} of the service which disconnected.
		* @param disconnectedInfo The {@link InCallServiceInfo} of the service which disconnected.
		*/
		private void onDisconnected(ComponentName disconnectedComponent) {
		Log.i(this, "onDisconnected from %s", disconnectedComponent);
		private void onDisconnected(InCallServiceInfo disconnectedInfo) {
		Log.i(this, "onDisconnected from %s", disconnectedInfo.getComponentName());

		mInCallServices.remove(disconnectedComponent);
		mInCallServices.remove(disconnectedInfo);
		}

		/**