commit 5abcd06b1f673a2d59d1aba5f4b95fe741ace274
author Andreas Gampe <agampe@google.com> Mon Mar 16 15:28:52 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Mar 16 15:28:53 2015 +0000
tree aab991b610d9d17303b434584df4b489f82cf68d
parent 386dcbddf5c166f98209b78389e79d49ab3a8222
parent 007cfa73b867a57458af415bc683bc56358a8049

Merge "Frameworks/base: Fix always-false equals"

core/java/android/view/WindowManager.java

diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 84434f7..d26bcd3 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1979,7 +1979,8 @@
             if (userActivityTimeout >= 0) {
                 sb.append(" userActivityTimeout=").append(userActivityTimeout);
             }
-            if (!surfaceInsets.equals(Insets.NONE)) {
+            if (surfaceInsets.left != 0 || surfaceInsets.top != 0 || surfaceInsets.right != 0 ||
+                    surfaceInsets.bottom != 0) {
                 sb.append(" surfaceInsets=").append(surfaceInsets);
             }
             if (needsMenuKey != NEEDS_MENU_UNSET) {