Merge "Add workaround for modem issue where pause bit is not set when on hold." into oc-dr1-dev (d70fdd53) · Commits · e / os / android_frameworks_opt_telephony

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

+24 −2

Original line number	Diff line number	Diff line
		@@ -2251,10 +2251,21 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		mPhone.stopOnHoldTone(conn);
		mOnHoldToneStarted = false;
		}

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

		boolean useVideoPauseWorkaround = mPhone.getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_useVideoPauseWorkaround);
		if (useVideoPauseWorkaround && mSupportPauseVideo &&
		VideoProfile.isVideo(conn.getVideoState())) {
		// If we are using the video pause workaround, the vendor IMS code has issues
		// with video pause signalling. In this case, when a call is remotely
		// held, the modem does not reliably change the video state of the call to be
		// paused.
		// As a workaround, we will turn on that bit now.
		conn.changeToUnPausedState();
		}

		SuppServiceNotification supp = new SuppServiceNotification();
		// Type of notification: 0 = MO; 1 = MT
		// Refer SuppServiceNotification class documentation.
		@@ -2276,8 +2287,19 @@ public class ImsPhoneCallTracker extends CallTracker implements ImsPullCall {
		mOnHoldToneStarted = true;
		mOnHoldToneId = System.identityHashCode(conn);
		}

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

		boolean useVideoPauseWorkaround = mPhone.getContext().getResources().getBoolean(
		com.android.internal.R.bool.config_useVideoPauseWorkaround);
		if (useVideoPauseWorkaround && mSupportPauseVideo &&
		VideoProfile.isVideo(conn.getVideoState())) {
		// If we are using the video pause workaround, the vendor IMS code has issues
		// with video pause signalling. In this case, when a call is remotely
		// held, the modem does not reliably change the video state of the call to be
		// paused.
		// As a workaround, we will turn on that bit now.
		conn.changeToPausedState();
		}
		}

		SuppServiceNotification supp = new SuppServiceNotification();

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

+22 −4

Original line number	Diff line number	Diff line
		@@ -842,10 +842,7 @@ public class ImsPhoneConnection extends Connection implements
		}

		if (!mShouldIgnoreVideoStateChanges) {
		if (mImsVideoCallProviderWrapper != null) {
		mImsVideoCallProviderWrapper.onVideoStateChanged(newVideoState);
		}
		setVideoState(newVideoState);
		updateVideoState(newVideoState);
		changed = true;
		} else {
		Rlog.d(LOG_TAG, "updateMediaCapabilities - ignoring video state change " +
		@@ -908,6 +905,13 @@ public class ImsPhoneConnection extends Connection implements
		return changed;
		}

		private void updateVideoState(int newVideoState) {
		if (mImsVideoCallProviderWrapper != null) {
		mImsVideoCallProviderWrapper.onVideoStateChanged(newVideoState);
		}
		setVideoState(newVideoState);
		}

		public void sendRttModifyRequest(android.telecom.Connection.RttTextStream textStream) {
		getImsCall().sendRttModifyRequest();
		setCurrentRttTextStream(textStream);
		@@ -1205,4 +1209,18 @@ public class ImsPhoneConnection extends Connection implements
		mIsMergeInProcess = false;
		onConnectionEvent(android.telecom.Connection.EVENT_MERGE_COMPLETE, null);
		}

		public void changeToPausedState() {
		int newVideoState = getVideoState() \| VideoProfile.STATE_PAUSED;
		Rlog.i(LOG_TAG, "ImsPhoneConnection: changeToPausedState - setting paused bit; "
		+ "newVideoState=" + VideoProfile.videoStateToString(newVideoState));
		updateVideoState(newVideoState);
		}

		public void changeToUnPausedState() {
		int newVideoState = getVideoState() & ~VideoProfile.STATE_PAUSED;
		Rlog.i(LOG_TAG, "ImsPhoneConnection: changeToUnPausedState - unsetting paused bit; "
		+ "newVideoState=" + VideoProfile.videoStateToString(newVideoState));
		updateVideoState(newVideoState);
		}
		}