Fix calls to Rect.intersect() in package android.view

This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.

bug: 7368679
Change-Id: Ib874345210c8f62550627544d717e958d46cfe13

1 files changed, 4 insertions, 1 deletions

diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java
index 3781d40..6e2d110 100644
--- a/core/java/android/view/AccessibilityInteractionController.java
+++ b/core/java/android/view/AccessibilityInteractionController.java
@@ -758,7 +758,10 @@ final class AccessibilityInteractionController {
             Rect visibleDisplayFrame = mTempRect2;
             visibleDisplayFrame.set(0, 0, displayWidth, displayHeight);
 
-            visibleWinFrame.intersect(visibleDisplayFrame);
+            if (!visibleWinFrame.intersect(visibleDisplayFrame)) {
+                // If there's no intersection with display, set visibleWinFrame empty.
+                visibleDisplayFrame.setEmpty();
+            }
 
             if (!visibleWinFrame.intersects(boundsInScreen.left, boundsInScreen.top,
                     boundsInScreen.right, boundsInScreen.bottom)) {