commit 66b0bf75aba7114499670a07743acd00f4662065
author Wei Sheng Shih <wilsonshih@google.com> Thu Jul 13 03:32:31 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 13 03:32:31 2023 +0000
tree 9a645ff0c05d3083623b677f40e3c6a5965ce5ee
parent 44f66349728a1b70abbaad10674a69f16c6a4722
parent eedf2a081c7e012830af2126018f08c4b5a4d887

Merge "Do not capture activity snapshot if starting window is associated to task." into udc-dev am: 1b84c35905 am: eedf2a081c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24016743

Change-Id: I90ae43a313d089061d3862203cbf52db73392d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/services/core/java/com/android/server/wm/Transition.java b/services/core/java/com/android/server/wm/Transition.java
index db3b267..0c7d007 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -723,6 +723,14 @@
             mFlags |= WindowManager.TRANSIT_FLAG_INVISIBLE;
             return;
         }
+        // Activity doesn't need to capture snapshot if the starting window has associated to task.
+        if (wc.asActivityRecord() != null) {
+            final ActivityRecord activityRecord = wc.asActivityRecord();
+            if (activityRecord.mStartingData != null
+                    && activityRecord.mStartingData.mAssociatedTask != null) {
+                return;
+            }
+        }
 
         if (mContainerFreezer == null) {
             mContainerFreezer = new ScreenshotFreezer();