commit 73f0e9a3feec091f67c9db00ce2d3116b6d91fbd
author Filip Gruszczynski <gruszczy@google.com> Mon Dec 08 19:33:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Dec 08 19:33:55 2014 +0000
tree 74c5c06de3529abd01925c2141cbd4a729e8f145
parent 0cfdd810ded6f8486a6b0a61044594f58ab5c052
parent 91a5dd9b435982eaad9ac4d8443199d260ef7208

am 91a5dd9b: am e6a2ff2b: Merge "Fix calculation of overscan insets in WindowState." into lmp-mr1-dev

* commit '91a5dd9b435982eaad9ac4d8443199d260ef7208':
  Fix calculation of overscan insets in WindowState.

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

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 978f5c3..9cf9a4c 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -615,8 +615,8 @@
 
         mOverscanInsets.set(Math.max(mOverscanFrame.left - mFrame.left, 0),
                 Math.max(mOverscanFrame.top - mFrame.top, 0),
-                Math.max(mFrame.right - mOverscanFrame.right, 0),
-                Math.max(mFrame.bottom - mOverscanFrame.bottom, 0));
+                Math.min(mFrame.right - mOverscanFrame.right, 0),
+                Math.min(mFrame.bottom - mOverscanFrame.bottom, 0));
 
         mContentInsets.set(mContentFrame.left - mFrame.left,
                 mContentFrame.top - mFrame.top,