diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-16 15:28:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-16 15:28:53 +0000 |
| commit | 5abcd06b1f673a2d59d1aba5f4b95fe741ace274 (patch) | |
| tree | aab991b610d9d17303b434584df4b489f82cf68d /core | |
| parent | 386dcbddf5c166f98209b78389e79d49ab3a8222 (diff) | |
| parent | 007cfa73b867a57458af415bc683bc56358a8049 (diff) | |
| download | frameworks_base-5abcd06b1f673a2d59d1aba5f4b95fe741ace274.zip frameworks_base-5abcd06b1f673a2d59d1aba5f4b95fe741ace274.tar.gz frameworks_base-5abcd06b1f673a2d59d1aba5f4b95fe741ace274.tar.bz2 | |
Merge "Frameworks/base: Fix always-false equals"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/WindowManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 @@ 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) { |