summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-04-16 20:50:23 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-04-16 20:50:23 +0000
commitc1c93761a36de5411ffe4b61f8b9d9da8ef9c816 (patch)
treeb2e934a753820eb1f2ef4685aa1bea9ba18e4ec4
parent91bf20930607e4804d7ddf95aa6b504aaa3498d4 (diff)
parent17fcc3204f2bb5cb622c01ebf996d3726a0c3550 (diff)
Merge "Fix issue that the hold label is not shown during remote video holding"
-rw-r--r--java/com/android/incallui/video/impl/VideoCallFragment.java10
1 files changed, 9 insertions, 1 deletions
diff --git a/java/com/android/incallui/video/impl/VideoCallFragment.java b/java/com/android/incallui/video/impl/VideoCallFragment.java
index 901facb01..db4806a52 100644
--- a/java/com/android/incallui/video/impl/VideoCallFragment.java
+++ b/java/com/android/incallui/video/impl/VideoCallFragment.java
@@ -696,9 +696,17 @@ public class VideoCallFragment extends Fragment
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) {