commit 2a2a1b1266e297f7494f17baf22f35e8409b668d
author Ikram Gabiyev <gabiyev@google.com> Thu Jul 13 17:57:37 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 13 17:57:37 2023 +0000
tree 1791d916dccd185af492f412d7b6e62f56eb5a91
parent 1b84c3590508a67b5640673c67edbdf0ab25b6b0
parent 931efa54c0a0d2419c68787a31f73dc5013d7b16

Merge "Make mCurrentPipTaskToken null when app crashes" into udc-dev

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 2c582c1..65c5c9b 100644
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -712,6 +712,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();