diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-06-01 19:08:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 19:08:48 +0000 |
| commit | c1ded116cd2d90e3dce7a518ad900c24cca835f8 (patch) | |
| tree | 84433dc6df39da8a4b1706ec2d24183d2faeef59 /InCallUI/src/com/android/incallui | |
| parent | 35e0c1776fd755e8dfe0079d478dd9342dfc8abc (diff) | |
| parent | c844194f1b6dc414adf652b5f35ce9eb970177f2 (diff) | |
Merge "IMS-VT: Remove the pause flag before requesting session modification" into nyc-mr1-dev am: 0138471ff9
am: c844194f1b
* commit 'c844194f1b6dc414adf652b5f35ce9eb970177f2':
IMS-VT: Remove the pause flag before requesting session modification
Change-Id: I8581195ace6b7521d986151cf7319cbd21c2f788
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); } |