Merge "Disconnect calls from other CS when hanging over to a self-mgd CS." into oc-mr1-dev (1cfe6e63) · Commits · e / os / android_packages_services_Telecomm

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

+11 −0

Original line number	Diff line number	Diff line
		@@ -2289,6 +2289,12 @@ public class CallsManager extends Call.ListenerBase
		handoverTo.sendCallEvent(android.telecom.Call.EVENT_HANDOVER_COMPLETE, null);
		answerCall(handoverTo, handoverTo.getVideoState());
		call.markFinishedHandoverStateAndCleanup(HandoverState.HANDOVER_COMPLETE);

		// If the call we handed over to is self-managed, we need to disconnect the calls for other
		// ConnectionServices.
		if (handoverTo.isSelfManaged()) {
		disconnectOtherCalls(handoverTo.getTargetPhoneAccount());
		}
		}

		private void rejectHandoverTo(Call handoverTo) {
		@@ -2327,6 +2333,11 @@ public class CallsManager extends Call.ListenerBase

		// Disconnect the call we handed over from.
		disconnectCall(handoverFrom);
		// If we handed over to a self-managed ConnectionService, we need to disconnect calls for
		// other ConnectionServices.
		if (handoverTo.isSelfManaged()) {
		disconnectOtherCalls(handoverTo.getTargetPhoneAccount());
		}
		}

		private void updateCanAddCall() {