Merge "Skip record snapshot for changes from PiP task" into udc-dev

2023-05-14 19:35:04 +00:00
parent bdee4a089b c9b84b7d27
commit a013cc2712
1 changed files with 3 additions and 0 deletions
--- a/services/core/java/com/android/server/wm/Transition.java
+++ b/services/core/java/com/android/server/wm/Transition.java
@@ -1470,6 +1470,9 @@ class Transition implements BLASTSyncEngine.TransactionReadyListener {
                final ActivityRecord ar = mParticipants.valueAt(i).asActivityRecord();
                if (ar == null || ar.getTask() == null
                        || ar.getTask().isVisibleRequested()) continue;
+                final ChangeInfo change = mChanges.get(ar);
+                // Intentionally skip record snapshot for changes originated from PiP.
+                if (change != null && change.mWindowingMode == WINDOWING_MODE_PINNED) continue;
                mController.mSnapshotController.mTaskSnapshotController.recordSnapshot(
                        ar.getTask(), false /* allowSnapshotHome */);
            }