Merge "Fixed logic error when calculating window touch exclude region." into nyc-dev

am: 8eb290150c

* commit '8eb290150c1e1d1c432643555342815f554bd32c':
  Fixed logic error when calculating window touch exclude region.

Change-Id: I2ca63c49eb7c26b0b5219e6c35cb0693fd9d7be3

services/core/java/com/android/server/wm/DisplayContent.java

@@ -378,6 +378,8 @@ class DisplayContent {
                  * We save the focused task region once we find it, and add it back at the end.
                  */
 
+                task.getDimBounds(mTmpRect);
+
                 if (task == focusedTask) {
                     addBackFocusedTask = true;
                     mTmpRect2.set(mTmpRect);
@@ -385,7 +387,6 @@ class DisplayContent {
 
                 final boolean isFreeformed = task.inFreeformWorkspace();
                 if (task != focusedTask || isFreeformed) {
-                    task.getDimBounds(mTmpRect);
                     if (isFreeformed) {
                         // If the task is freeformed, enlarge the area to account for outside
                         // touch area for resize.