summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorTyler Gunn <tgunn@google.com>2016-05-26 08:54:15 -0700
committerTyler Gunn <tgunn@google.com>2016-05-26 08:54:15 -0700
commit2ba554e898b58daca2fac85227d1a287080960f9 (patch)
treea5336197ba1b12437f6b1ded5fd45b4880cfae58 /InCallUI
parentf6ce2079891bdcddd9902c7254a7327e43925c56 (diff)
IMS-VT: Remove the pause flag before requesting session modification
This change removes the pause flag before sending session modification request to lower layers. The pause flag shall be set only upon requesting video pause. BUG: 28687464 Change-Id: I413b913d10159b91a575c2af49e50d807f7decde
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/src/com/android/incallui/CallButtonPresenter.java9
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);
}