commit 25ab2966308e9f5a2c4a30210eae64c175e1a019
author Sekine Yasuaki <yasuaki.sekine@sony.com> Tue Jul 04 16:50:09 2017 +0900
committer rohan <purohit.rohan@gmail.com> Tue May 26 08:19:50 2020 -0400
tree 8340f7ac93ecc7264e54a0ad61b3c70f03de008c
parent 0c1f107a8fbb7cab3411f97ce491a45e1522b88f

Fix to update peer dimensions when video screen resumes foreground

[Issue/Cause of defect]
If partner device is rotated during video screen of target device is in
background, and then resumes to foreground, partner image will be shown
with incorrect dimensions.

Because when video screen goes to background, VideoCallPresenter stops
checking CVO(Coordination of Video Orientation) of partner device. And
when video screen is resumed to foreground, there is no logic to update
partner image with latest peer dimensions.

[How to fix]
Even if video screen is in background, CVO(peer dimensions) is notified
to DialerCall. Therefore DialerCall should store the dimensions. And
when video screen resumes to fore, VideoCallPresenter should update the
screen with correct(latest) peer dimensions.

Test: manual - Checked that the partner image is shown with correct
dimensions.
Bug: 111575038

Change-Id: I32ff5407f1222b232b47a35e7083a473be67b468

java/com/android/incallui/VideoCallPresenter.java

diff --git a/java/com/android/incallui/VideoCallPresenter.java b/java/com/android/incallui/VideoCallPresenter.java
index 5bdcd7a..1700d53 100644
--- a/java/com/android/incallui/VideoCallPresenter.java
+++ b/java/com/android/incallui/VideoCallPresenter.java
@@ -323,6 +323,17 @@
     InCallPresenter.InCallState inCallState = InCallPresenter.getInstance().getInCallState();
     onStateChange(inCallState, inCallState, CallList.getInstance());
     isVideoCallScreenUiReady = true;
+
+    Point sourceVideoDimensions = getRemoteVideoSurfaceTexture().getSourceVideoDimensions();
+    if (sourceVideoDimensions != null && primaryCall != null) {
+      int width = primaryCall.getPeerDimensionWidth();
+      int height = primaryCall.getPeerDimensionHeight();
+      boolean updated = DialerCall.UNKNOWN_PEER_DIMENSIONS != width
+          && DialerCall.UNKNOWN_PEER_DIMENSIONS != height;
+      if (updated && (sourceVideoDimensions.x != width || sourceVideoDimensions.y != height)) {
+        onUpdatePeerDimensions(primaryCall, width, height);
+      }
+    }
   }
 
   /** Called when the user interface is no longer ready to be used. */

java/com/android/incallui/call/DialerCall.java

diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 1f4e49a..f9afd2d 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -126,6 +126,8 @@
 
   private static int idCounter = 0;
 
+  public static final int UNKNOWN_PEER_DIMENSIONS = -1;
+
   /**
    * A counter used to append to restricted/private/hidden calls so that users can identify them in
    * a conversation. This value is reset in {@link CallList#onCallRemoved(Context, Call)} when there
@@ -386,6 +388,8 @@
       };
 
   private long timeAddedMs;
+  private int peerDimensionWidth = UNKNOWN_PEER_DIMENSIONS;
+  private int peerDimensionHeight = UNKNOWN_PEER_DIMENSIONS;
 
   public DialerCall(
       Context context,
@@ -1558,6 +1562,8 @@
 
   @Override
   public void onPeerDimensionsChanged(int width, int height) {
+    peerDimensionWidth = width;
+    peerDimensionHeight = height;
     InCallVideoCallCallbackNotifier.getInstance().peerDimensionsChanged(this, width, height);
   }
 
@@ -1974,4 +1980,14 @@
   public interface CannedTextResponsesLoadedListener {
     void onCannedTextResponsesLoaded(DialerCall call);
   }
+
+  /** Gets peer dimension width. */
+  public int getPeerDimensionWidth() {
+    return peerDimensionWidth;
+  }
+
+  /** Gets peer dimension height. */
+  public int getPeerDimensionHeight() {
+    return peerDimensionHeight;
+  }
 }