From b6843d5d2714f0b73004846b5a7c0fc0ae03a63d Mon Sep 17 00:00:00 2001
From: Yuichiro Hanada <yhanada@google.com>
Date: Fri, 17 Jul 2020 19:02:01 +0900
Subject: [PATCH] Offset dirty rect for surface insets correctly.

Dirty rect can be offset wrongly if surfaceInsets.top is different from
surfaceInsets.right. It causes some part of UI is not rendered
correctly.

Bug: 158044845
Test: go/wm-smoke

Change-Id: Ice0158c455ce99c27f03005ae5deaa2b04d000c2
---
 core/java/android/view/ViewRootImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index fe6f33da6d2a7..6552e30dde69a 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -4032,7 +4032,7 @@ public final class ViewRootImpl implements ViewParent,
             yOffset -= surfaceInsets.top;
 
             // Offset dirty rect for surface insets.
-            dirty.offset(surfaceInsets.left, surfaceInsets.right);
+            dirty.offset(surfaceInsets.left, surfaceInsets.top);
         }
 
         boolean accessibilityFocusDirty = false;