From b8feac1291c1684c81eb14c9fd1993f9401c65a6 Mon Sep 17 00:00:00 2001
From: shawnlin <shawnlin@google.com>
Date: Mon, 2 Nov 2020 17:41:48 +0800
Subject: [PATCH] Fix incorrect system gesture insets reported when there are
 cutout areas on the left/right edges of the display

Should calculate the gesture insets based on left/right cutout insets.

Bug: 172191437
Test: atest WindowInsetsBehaviorTests
Change-Id: I75e2da14ab5c05c559d4420c239184834794505e
---
 .../core/java/com/android/server/wm/DisplayPolicy.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/services/core/java/com/android/server/wm/DisplayPolicy.java b/services/core/java/com/android/server/wm/DisplayPolicy.java
index 7a42b0db0c52d..df2edd0412b3d 100644
--- a/services/core/java/com/android/server/wm/DisplayPolicy.java
+++ b/services/core/java/com/android/server/wm/DisplayPolicy.java
@@ -1153,15 +1153,19 @@ public class DisplayPolicy {
                         });
                 mDisplayContent.setInsetProvider(ITYPE_LEFT_GESTURES, win,
                         (displayFrames, windowState, inOutFrame) -> {
+                            final int leftSafeInset =
+                                    Math.max(displayFrames.mDisplayCutoutSafe.left, 0);
                             inOutFrame.left = 0;
                             inOutFrame.top = 0;
                             inOutFrame.bottom = displayFrames.mDisplayHeight;
-                            inOutFrame.right = displayFrames.mUnrestricted.left + mLeftGestureInset;
+                            inOutFrame.right = leftSafeInset + mLeftGestureInset;
                         });
                 mDisplayContent.setInsetProvider(ITYPE_RIGHT_GESTURES, win,
                         (displayFrames, windowState, inOutFrame) -> {
-                            inOutFrame.left = displayFrames.mUnrestricted.right
-                                    - mRightGestureInset;
+                            final int rightSafeInset =
+                                    Math.min(displayFrames.mDisplayCutoutSafe.right,
+                                            displayFrames.mUnrestricted.right);
+                            inOutFrame.left = rightSafeInset - mRightGestureInset;
                             inOutFrame.top = 0;
                             inOutFrame.bottom = displayFrames.mDisplayHeight;
                             inOutFrame.right = displayFrames.mDisplayWidth;