commit c1c93761a36de5411ffe4b61f8b9d9da8ef9c816
author Treehugger Robot <treehugger-gerrit@google.com> Tue Apr 16 20:50:23 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 16 20:50:23 2019 +0000
tree b2e934a753820eb1f2ef4685aa1bea9ba18e4ec4
parent 91bf20930607e4804d7ddf95aa6b504aaa3498d4
parent 17fcc3204f2bb5cb622c01ebf996d3726a0c3550

Merge "Fix issue that the hold label is not shown during remote video holding"

java/com/android/incallui/video/impl/VideoCallFragment.java

diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index 901facb..db4806a 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -696,9 +696,17 @@
     videoCallScreenDelegate.getLocalVideoSurfaceTexture().attachToTextureView(previewTextureView);
     videoCallScreenDelegate.getRemoteVideoSurfaceTexture().attachToTextureView(remoteTextureView);
 
-    this.isRemotelyHeld = isRemotelyHeld;
+    boolean updateRemoteOffView = false;
     if (this.shouldShowRemote != shouldShowRemote) {
       this.shouldShowRemote = shouldShowRemote;
+      updateRemoteOffView = true;
+    }
+    if (this.isRemotelyHeld != isRemotelyHeld) {
+      this.isRemotelyHeld = isRemotelyHeld;
+      updateRemoteOffView = true;
+    }
+
+    if (updateRemoteOffView) {
       updateRemoteOffView();
     }
     if (this.shouldShowPreview != shouldShowPreview) {