diff options
author | Tyler Gunn <tgunn@google.com> | 2016-06-01 17:42:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-01 17:42:05 +0000 |
commit | 0138471ff9ea1f05477442740060c7233a806779 (patch) | |
tree | 30c9a22a63d5d56710af027b6a62def1d037a1e4 /InCallUI/src/com/android/incallui | |
parent | 1335994507a9dd0780e0c770d1ba6dbe059176c7 (diff) | |
parent | 2ba554e898b58daca2fac85227d1a287080960f9 (diff) |
Merge "IMS-VT: Remove the pause flag before requesting session modification" into nyc-mr1-dev
Diffstat (limited to 'InCallUI/src/com/android/incallui')
-rw-r--r-- | InCallUI/src/com/android/incallui/CallButtonPresenter.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java index df1cd6645..defafda99 100644 --- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java +++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java @@ -322,17 +322,18 @@ public class CallButtonPresenter extends Presenter<CallButtonPresenter.CallButto return; } + final int currUnpausedVideoState = VideoUtils.getUnPausedVideoState(mCall.getVideoState()); if (pause) { videoCall.setCamera(null); - VideoProfile videoProfile = new VideoProfile( - mCall.getVideoState() & ~VideoProfile.STATE_TX_ENABLED); + VideoProfile videoProfile = new VideoProfile(currUnpausedVideoState + & ~VideoProfile.STATE_TX_ENABLED); videoCall.sendSessionModifyRequest(videoProfile); } else { InCallCameraManager cameraManager = InCallPresenter.getInstance(). getInCallCameraManager(); videoCall.setCamera(cameraManager.getActiveCameraId()); - VideoProfile videoProfile = new VideoProfile( - mCall.getVideoState() | VideoProfile.STATE_TX_ENABLED); + VideoProfile videoProfile = new VideoProfile(currUnpausedVideoState + | VideoProfile.STATE_TX_ENABLED); videoCall.sendSessionModifyRequest(videoProfile); mCall.setSessionModificationState(Call.SessionModificationState.WAITING_FOR_RESPONSE); } |