Merge "Fix the difference in design between SSSS and DSDA" (6efec7ce) · Commits · e / os / android_packages_services_Telecomm

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

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1549,7 +1549,9 @@ public final class CallsManager extends Call.ListenerBase {
	// There is no more room for any more calls, unless it's an emergency.		// There is no more room for any more calls, unless it's an emergency.
	return false; // No more room!		return false; // No more room!
	}		}
			if (Objects.equals(liveCall.getTargetPhoneAccount(), call.getTargetPhoneAccount())) {
			return true;
			}
	// Try to hold the live call before attempting the new outgoing call.		// Try to hold the live call before attempting the new outgoing call.
	if (liveCall.can(PhoneCapabilities.HOLD)) {		if (liveCall.can(PhoneCapabilities.HOLD)) {
	liveCall.hold();		liveCall.hold();