commit 4d59d52d1e9273b828b4bee09b4fb4764e1dcb7a
author Mateusz Cicheński <mateuszc@google.com> Sat Oct 21 00:03:34 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Oct 21 00:03:34 2023 +0000
tree b0242949161d3149c6cd0117adf8bdbe00ae893b
parent e4900713b9466e063494428226959323931868dc
parent d21cf61e86f6cf588b3172bf35bbc31db785b937

Merge "Validate source rect hint for enter PIP in gesture nav" into main

quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java

diff --git a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
index 7cc2c46..fce38e1 100644
--- a/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
+++ b/quickstep/src/com/android/quickstep/util/SwipePipToHomeAnimator.java
@@ -145,6 +145,12 @@
             sourceRectHint = null;
         }
 
+        if (sourceRectHint != null && !appBounds.contains(sourceRectHint)) {
+            // This is a situation in which the source hint rect is outside the app bounds, so it is
+            // not a valid rectangle to use for cropping app surface
+            sourceRectHint = null;
+        }
+
         if (sourceRectHint == null) {
             mSourceRectHint.setEmpty();
             mSourceHintRectInsets = null;