commit f1f56fdd1f248ec6d91c4f16d083b91cf1b83906
author Wei Sheng Shih <wilsonshih@google.com> Wed Apr 26 03:09:29 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 26 03:09:29 2023 +0000
tree 820e0959014a13d0bc110eee1896bf5f88b0a248
parent 6fe97e67cf37e64ad58dd11c51000a2a5479379d
parent 1a7d29e79b21eb9c03a45470f785e3029ef94cde

Merge "Capture task snapshot with initial bounds during finish transition." into udc-dev

services/core/java/com/android/server/wm/AbsAppSnapshotController.java

diff --git a/services/core/java/com/android/server/wm/AbsAppSnapshotController.java b/services/core/java/com/android/server/wm/AbsAppSnapshotController.java
index 32f7b96..5c929a9 100644
--- a/services/core/java/com/android/server/wm/AbsAppSnapshotController.java
+++ b/services/core/java/com/android/server/wm/AbsAppSnapshotController.java
@@ -239,7 +239,17 @@
             }
             return null;
         }
-        source.getBounds(mTmpRect);
+        mTmpRect.setEmpty();
+        if (source.mTransitionController.inFinishingTransition(source)) {
+            final Transition.ChangeInfo changeInfo = source.mTransitionController
+                    .mFinishingTransition.mChanges.get(source);
+            if (changeInfo != null) {
+                mTmpRect.set(changeInfo.mAbsoluteBounds);
+            }
+        }
+        if (mTmpRect.isEmpty()) {
+            source.getBounds(mTmpRect);
+        }
         mTmpRect.offsetTo(0, 0);
         SurfaceControl[] excludeLayers;
         final WindowState imeWindow = source.getDisplayContent().mInputMethodWindow;