diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-13 23:18:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-13 23:18:06 +0000 |
| commit | 904eb21b49a54e034e42d16598f6751e42c82f8f (patch) | |
| tree | 718835c63a669020ccc5546472111985f4410b4e /java/com/android/incallui | |
| parent | b21b9f9b2efbc358ee9806af87b7edc3f82af4da (diff) | |
| parent | 7bea0364b6f8932f54cdb518de1014f408f0f3f3 (diff) | |
Merge changes Ie58920b7,Iaaf84ab9
* changes:
Fixed crash in RemoteContactCusror.
Log swiping and clicking for switching tabs.
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java index b83929304..49170b8dc 100644 --- a/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java +++ b/java/com/android/incallui/videotech/ims/ImsVideoCallCallback.java @@ -66,10 +66,16 @@ public class ImsVideoCallCallback extends VideoCall.Callback { "ImsVideoTech.onSessionModifyRequestReceived", "call downgraded to %d", newVideoState); } else if (previousVideoState != newVideoState) { requestedVideoState = newVideoState; - videoTech.setSessionModificationState( - SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST); - listener.onVideoUpgradeRequestReceived(); - logger.logImpression(DialerImpression.Type.IMS_VIDEO_REQUEST_RECEIVED); + if (!wasVideoCall) { + videoTech.setSessionModificationState( + SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST); + listener.onVideoUpgradeRequestReceived(); + logger.logImpression(DialerImpression.Type.IMS_VIDEO_REQUEST_RECEIVED); + } else { + LogUtil.i( + "ImsVideoTech.onSessionModifyRequestReceived", "call updated to %d", newVideoState); + videoTech.acceptVideoRequest(); + } } } |