From 8afe058842b3af5789fe8eb5fb4eb010edd0acd9 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Tue, 5 May 2015 16:09:42 -0700
Subject: Fix bug where outgoing calls go to full-screen before answered.

Now that VT is working for me again, I noticed this (the test connection
service answers instantly).

Solved my requiring a primary call which is active before auto-entering
full screen mode.

Bug: 19850117
Change-Id: I625838ebc1d78d6bfe594ff49822f76f7ac56ab9
---
 InCallUI/src/com/android/incallui/VideoCallPresenter.java | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'InCallUI/src/com/android/incallui/VideoCallPresenter.java')

diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
index 6309acbe7..3ae7cfd05 100644
--- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java
+++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java
@@ -465,6 +465,7 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
             updateVideoCall(primary);
         }
         updateCallCache(primary);
+        maybeAutoEnterFullscreen();
     }
 
     private void checkForVideoStateChange(Call call) {
@@ -1073,6 +1074,11 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi
             return;
         }
 
+        if (mPrimaryCall == null || (mPrimaryCall != null
+                && mPrimaryCall.getState() != Call.State.ACTIVE) || mIsFullScreen) {
+            return;
+        }
+
         if (mAutoFullScreenPending) {
             Log.v(this, "maybeAutoEnterFullscreen : already pending.");
             return;
-- 
cgit v1.2.3