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
diff --git a/InCallUI/src/com/android/incallui/CallButtonPresenter.java b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
index df1cd66..defafda 100644
--- a/InCallUI/src/com/android/incallui/CallButtonPresenter.java
+++ b/InCallUI/src/com/android/incallui/CallButtonPresenter.java
@@ -322,17 +322,18 @@
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);
}