From 7393c7b3ec4230f2dc2caf4c6a8c25dfcf6a5b91 Mon Sep 17 00:00:00 2001
From: Robert Carr <racarr@google.com>
Date: Sun, 17 Apr 2016 19:24:21 -0700
Subject: [PATCH] Always update DimLayer bounds when starting dim.

Otherwise animateDimLayers can occur before
updateDimLayers and we can show the dim at the
wrong size.

Bug: 26908486
Change-Id: Ifd664e48f3daa77900a7f0bffa58a379efa6b53c
---
 .../core/java/com/android/server/wm/DimLayerController.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/DimLayerController.java b/services/core/java/com/android/server/wm/DimLayerController.java
index 3ec02b9f66fc7..483db6fe72b49 100644
--- a/services/core/java/com/android/server/wm/DimLayerController.java
+++ b/services/core/java/com/android/server/wm/DimLayerController.java
@@ -149,8 +149,10 @@ class DimLayerController {
             if (state.animator.mWin.mAppToken == null && !dimLayerUser.isFullscreen()) {
                 // Dim should cover the entire screen for system windows.
                 mDisplayContent.getLogicalDisplayRect(mTmpBounds);
-                state.dimLayer.setBounds(mTmpBounds);
+            } else {
+                dimLayerUser.getDimBounds(mTmpBounds);
             }
+            state.dimLayer.setBounds(mTmpBounds);
         }
     }