From b1bd44227c054d515efe02c58389d10f4eaac993 Mon Sep 17 00:00:00 2001
From: Yuncheol Heo <ycheo@google.com>
Date: Tue, 15 Feb 2022 17:33:44 -0800
Subject: [PATCH] Set the offset of the dim layer of DisplayArea.

Bug: 217637411
Test: Check if the dim layer of DisplayArea is positioned correctly.
Change-Id: I8fd3494a3cd7ad6183ce6aa442e49f85b441c73f
Merged-In: I8fd3494a3cd7ad6183ce6aa442e49f85b441c73f
(cherry picked from commit f80d567a7e3635728e97e7b589452ea5063f192d)
---
 services/core/java/com/android/server/wm/DisplayArea.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/services/core/java/com/android/server/wm/DisplayArea.java b/services/core/java/com/android/server/wm/DisplayArea.java
index 99f6fd4771b71..2130e3373e5f2 100644
--- a/services/core/java/com/android/server/wm/DisplayArea.java
+++ b/services/core/java/com/android/server/wm/DisplayArea.java
@@ -644,7 +644,9 @@ public class DisplayArea<T extends WindowContainer> extends WindowContainer<T> {
         void prepareSurfaces() {
             mDimmer.resetDimStates();
             super.prepareSurfaces();
+            // Bounds need to be relative, as the dim layer is a child.
             getBounds(mTmpDimBoundsRect);
+            mTmpDimBoundsRect.offsetTo(0 /* newLeft */, 0 /* newTop */);
 
             // If SystemUI is dragging for recents, we want to reset the dim state so any dim layer
             // on the display level fades out.