am 5abcd06b: Merge "Frameworks/base: Fix always-false equals"

* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
  Frameworks/base: Fix always-false equals
This commit is contained in:
Andreas Gampe
2015-03-16 15:43:37 +00:00
committed by Android Git Automerger

View File

@@ -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) {