From 2ba554e898b58daca2fac85227d1a287080960f9 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Thu, 26 May 2016 08:54:15 -0700
Subject: 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
---
 InCallUI/src/com/android/incallui/CallButtonPresenter.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'InCallUI')

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);
         }
-- 
cgit v1.2.3