1 files changed, 5 insertions, 1 deletions
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index 7cdf8b2..4545032 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -144,7 +144,11 @@ public class TaskStack {
                 bounds = mTmpRect;
                 mFullscreen = true;
             } else {
-                bounds.intersect(mTmpRect); // ensure bounds are entirely within the display rect
+                // ensure bounds are entirely within the display rect
+                if (!bounds.intersect(mTmpRect)) {
+                    // Can't set bounds outside the containing display.. Sorry!
+                    return false;
+                }
                 mFullscreen = mTmpRect.equals(bounds);
             }
         }