Merge change 22282 into eclair (c813129f) · Commits · e / os / android_frameworks_base

telephony/java/com/android/internal/telephony/cdma/CdmaCallTracker.java

100755 → 100644

+7 −1

Original line number	Diff line number	Diff line
		@@ -294,8 +294,14 @@ public final class CdmaCallTracker extends CallTracker {
		// Should we bother with this check?
		if (ringingCall.getState() == CdmaCall.State.INCOMING) {
		throw new CallStateException("cannot be in the incoming state");
		} else {
		} else if (foregroundCall.getConnections().size() > 1) {
		flashAndSetGenericTrue();
		} else {
		// Send a flash command to CDMA network for putting the other party on hold.
		// For CDMA networks which do not support this the user would just hear a beep
		// from the network. For CDMA networks which do support it will put the other
		// party on hold.
		cm.sendCDMAFeatureCode("", obtainMessage(EVENT_SWITCH_RESULT));
		}
		}