diff options
author | Hall Liu <hallliu@google.com> | 2018-10-06 00:49:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-06 00:49:14 +0000 |
commit | f23cfaba399b6471d1da378ea0e9d00404c9445a (patch) | |
tree | 1d30a9e1af4981dcc2d529e8f5e6c42e0e2e202a | |
parent | e88480f676217c45d65c6d0f7c922b33a28ed913 (diff) | |
parent | d63044513325af5a80602b952b7fba09be5b5af9 (diff) | |
download | ims-android-o-mr1-iot-release-smart-display-r3.tar.gz |
Merge "Wire up the stopRtt API"android-o-mr1-iot-release-smart-display-r3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
-rw-r--r-- | src/java/com/android/ims/ImsCall.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 04781e33..667cb3d4 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -1648,16 +1648,20 @@ public class ImsCall implements ICall { /** * Sends a user-requested RTT upgrade request. + * @param rttOn true if the request is to turn on RTT, false to turn off. */ - public void sendRttModifyRequest() { + public void sendRttModifyRequest(boolean rttOn) { logi("sendRttModifyRequest"); synchronized(mLockObj) { if (mSession == null) { loge("sendRttModifyRequest::no session"); } - if (mCallProfile.mMediaProfile.isRttCall()) { - logi("sendRttModifyRequest::Already RTT call, ignoring."); + if (rttOn && mCallProfile.mMediaProfile.isRttCall()) { + logi("sendRttModifyRequest::Already RTT call, ignoring request to turn on."); + return; + } else if (!rttOn && !mCallProfile.mMediaProfile.isRttCall()) { + logi("sendRttModifyRequest::Not RTT call, ignoring request to turn off."); return; } // Make a copy of the current ImsCallProfile and modify it to enable RTT @@ -1665,7 +1669,9 @@ public class ImsCall implements ICall { mCallProfile.writeToParcel(p, 0); p.setDataPosition(0); ImsCallProfile requestedProfile = new ImsCallProfile(p); - requestedProfile.mMediaProfile.setRttMode(ImsStreamMediaProfile.RTT_MODE_FULL); + requestedProfile.mMediaProfile.setRttMode(rttOn + ? ImsStreamMediaProfile.RTT_MODE_FULL + : ImsStreamMediaProfile.RTT_MODE_DISABLED); mSession.sendRttModifyRequest(requestedProfile); } |