Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Gampe
2015-03-16 15:28:52 +00:00
committed by Gerrit Code Review
parent 386dcbddf5 007cfa73b8
commit 5abcd06b1f
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/view/WindowManager.java
View File

@@ -1979,7 +1979,8 @@ public interface WindowManager extends ViewManager {
if (userActivityTimeout >= 0) { if (userActivityTimeout >= 0) {
sb.append(" userActivityTimeout=").append(userActivityTimeout); 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); sb.append(" surfaceInsets=").append(surfaceInsets);
} }
if (needsMenuKey != NEEDS_MENU_UNSET) { if (needsMenuKey != NEEDS_MENU_UNSET) {