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

2015-03-16 15:28:52 +00:00
parent 386dcbddf5 007cfa73b8
commit 5abcd06b1f
1 changed files with 2 additions and 1 deletions
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1979,7 +1979,8 @@ public interface WindowManager extends ViewManager {
            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) {