commit 1109006158630c02784a8cf93675c0e14722c27b
author Andreas Gampe <agampe@google.com> Mon Mar 16 09:45:34 2015 -0700
committer Andreas Gampe <agampe@google.com> Mon Mar 16 09:45:34 2015 -0700
tree 1d1d29226cc7652a9da2340c0c02a9b4ce601866
parent 0e22acb6352aa72574e7d936e3ef3b5873ba9de3
parent 038b846284d666d94e8f52d7619ff26087165f73

resolved conflicts for merge of 038b8462 to master

Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554

core/java/android/view/WindowManager.java

diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 905d6d7..66dae7b 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1989,7 +1989,8 @@
             if (userActivityTimeout >= 0) {
                 sb.append(" userActivityTimeout=").append(userActivityTimeout);
             }
-            if (!surfaceInsets.equals(Insets.NONE) || hasManualSurfaceInsets) {
+            if (surfaceInsets.left != 0 || surfaceInsets.top != 0 || surfaceInsets.right != 0 ||
+                    surfaceInsets.bottom != 0 || hasManualSurfaceInsets) {
                 sb.append(" surfaceInsets=").append(surfaceInsets);
                 if (hasManualSurfaceInsets) {
                     sb.append(" (manual)");