summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOya Masafumi <masafumi.x.oya@sony.com>2018-05-31 12:25:04 +0900
committertakeshi tanigawa <takeshi.tanigawa@sony.com>2018-06-15 09:00:53 +0000
commit17fcc3204f2bb5cb622c01ebf996d3726a0c3550 (patch)
tree83b6b821e26756863733491d71a0fc30faf74987
parenta25e320431d172139b0baf0e3162b8a47e0744fa (diff)
Fix issue that the hold label is not shown during remote video holding
Hold label is not shown even if a remote party holds a video call because VideoCallFragment#updateRemoteOffView is not called. A condition checking shouldShowRemote whether to call the method was added in #I4be3488. But shouldShowRemote is not updated in this case. To solve this issue, checks isRemotelyHeld that indicates hold status of remote party and calls #updateRemoteOffView if it is updated. Test: manual - Check that the hold label is shown when a remote party holds a video call Bug: 110244504 Change-Id: I2dfac18b1a913de50adfbe4cc76f073678f5e186
-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 11b80ceb9..02dd80471 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) {