diff options
| author | Oya Masafumi <masafumi.x.oya@sony.com> | 2019-04-16 14:37:06 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-16 14:37:06 -0700 |
| commit | 8e9d0529136d24e56cbfdc167cf20db4debe7dcb (patch) | |
| tree | b2e934a753820eb1f2ef4685aa1bea9ba18e4ec4 | |
| parent | 96026df419a9203ac2a2ba0ed6a7a41ddf2458e2 (diff) | |
| parent | 12a51def3cfc8b086336b2125034167c6c158072 (diff) | |
Merge "Fix issue that the hold label is not shown during remote video holding" am: c1c93761a3
am: 12a51def3c
Change-Id: Ib9ccc7b8f8d72bab16ba7b19f1b202aa9f4bba45
| -rw-r--r-- | java/com/android/incallui/video/impl/VideoCallFragment.java | 10 |
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) { |