Merge "Fire connection events when call is remotely held and unheld." into nyc-mr1-dev (9d20ef64) · Commits · e / os / android_frameworks_opt_telephony

src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java

+12 −5

Original line number	Diff line number	Diff line
		@@ -1730,11 +1730,15 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		public void onCallResumeReceived(ImsCall imsCall) {
		if (DBG) log("onCallResumeReceived");
		ImsPhoneConnection conn = findConnection(imsCall);
		if (conn != null && mOnHoldToneStarted) {
		if (conn != null) {
		if (mOnHoldToneStarted) {
		mPhone.stopOnHoldTone(conn);
		mOnHoldToneStarted = false;
		}

		conn.onConnectionEvent(android.telecom.Connection.EVENT_CALL_REMOTELY_UNHELD, null);
		}

		SuppServiceNotification supp = new SuppServiceNotification();
		// Type of notification: 0 = MO; 1 = MT
		// Refer SuppServiceNotification class documentation.
		@@ -1749,12 +1753,15 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		if (DBG) log("onCallHoldReceived");

		ImsPhoneConnection conn = findConnection(imsCall);
		if (conn != null && conn.getState() == ImsPhoneCall.State.ACTIVE) {
		if (!mOnHoldToneStarted && ImsPhoneCall.isLocalTone(imsCall)) {
		if (conn != null) {
		if (!mOnHoldToneStarted && ImsPhoneCall.isLocalTone(imsCall) &&
		conn.getState() == ImsPhoneCall.State.ACTIVE) {
		mPhone.startOnHoldTone(conn);
		mOnHoldToneStarted = true;
		mOnHoldToneId = System.identityHashCode(conn);
		}

		conn.onConnectionEvent(android.telecom.Connection.EVENT_CALL_REMOTELY_HELD, null);
		}

		SuppServiceNotification supp = new SuppServiceNotification();