1 files changed, 6 insertions, 0 deletions
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;