commit 7b371ddfbd5f4387703b76a30562fa7abcb0fc0e
author Jorim Jaggi <jjaggi@google.com> Tue Jan 05 15:32:34 2016 +0100
committer Jorim Jaggi <jjaggi@google.com> Tue Jan 05 14:35:50 2016 +0000
tree 06b0906acd51cd6fcd76625e741f80f7f1c307c6
parent 2a37455a285c831dbe4e367bdb632f687f3d3f5d

Do not pass invalid bounds for dim layer

Makes the entire system freeze.

Bug: 26396656
Change-Id: I9e9b0a297a351cd8ef72cdc8f5994df6c42567d9

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

diff --git a/services/core/java/com/android/server/wm/DockedStackDividerController.java b/services/core/java/com/android/server/wm/DockedStackDividerController.java
index 27ff5bc8e..88aad13 100644
--- a/services/core/java/com/android/server/wm/DockedStackDividerController.java
+++ b/services/core/java/com/android/server/wm/DockedStackDividerController.java
@@ -172,12 +172,18 @@
     void setResizeDimLayer(boolean visible, int targetStackId, float alpha) {
         SurfaceControl.openTransaction();
         TaskStack stack = mDisplayContent.mService.mStackIdToStack.get(targetStackId);
-        if (visible && stack != null) {
+        boolean visibleAndValid = visible && stack != null;
+        if (visibleAndValid) {
             stack.getDimBounds(mTmpRect);
-            mDimLayer.setBounds(mTmpRect);
-            mDimLayer.show(mDisplayContent.mService.mLayersController.getResizeDimLayer(), alpha,
-                    0 /* duration */);
-        } else {
+            if (mTmpRect.height() > 0) {
+                mDimLayer.setBounds(mTmpRect);
+                mDimLayer.show(mDisplayContent.mService.mLayersController.getResizeDimLayer(),
+                        alpha, 0 /* duration */);
+            } else {
+                visibleAndValid = false;
+            }
+        }
+        if (!visibleAndValid) {
             mDimLayer.hide();
         }
         SurfaceControl.closeTransaction();