diff options
| author | Tyler Gunn <tgunn@google.com> | 2016-06-01 18:21:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-01 18:21:28 +0000 |
| commit | c844194f1b6dc414adf652b5f35ce9eb970177f2 (patch) | |
| tree | d9edaf84179669e2f4f7e7d9109d13d8133b3340 /InCallUI | |
| parent | 3016064e2cb1c3dbd79413d38beabe88e556c3b6 (diff) | |
| parent | 0138471ff9ea1f05477442740060c7233a806779 (diff) | |
Merge "IMS-VT: Remove the pause flag before requesting session modification" into nyc-mr1-dev
am: 0138471ff9
* commit '0138471ff9ea1f05477442740060c7233a806779':
IMS-VT: Remove the pause flag before requesting session modification
Change-Id: I595052e94cbf579392096f8dde1adaad39dad55b
Diffstat (limited to '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); } |