diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-14 21:50:15 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-14 21:50:15 -0700 |
| commit | e52a5a5fca18348728dfc5609b42b88e9cc7ef98 (patch) | |
| tree | fc2b68d63aa4c4ad0d2be157af0bb4bc5570ebb4 /core/java/android/view/ViewDebug.java | |
| parent | f045bb25813916a639e6e5bb15faec729ab5702f (diff) | |
| parent | 669ec3a6e47248fee0a3a0f4877b46875eb42140 (diff) | |
| download | frameworks_base-e52a5a5fca18348728dfc5609b42b88e9cc7ef98.zip frameworks_base-e52a5a5fca18348728dfc5609b42b88e9cc7ef98.tar.gz frameworks_base-e52a5a5fca18348728dfc5609b42b88e9cc7ef98.tar.bz2 | |
am 669ec3a6: Merge change 1747 into donut
Merge commit '669ec3a6e47248fee0a3a0f4877b46875eb42140'
* commit '669ec3a6e47248fee0a3a0f4877b46875eb42140':
Fixes #1846038. The dirty region can sometimes be modified by SurfaceFlinger. When this happens, force the view hierarchy to ignore the dirty flags.
Diffstat (limited to 'core/java/android/view/ViewDebug.java')
| -rw-r--r-- | core/java/android/view/ViewDebug.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/view/ViewDebug.java b/core/java/android/view/ViewDebug.java index 74a248f..aaaadef 100644 --- a/core/java/android/view/ViewDebug.java +++ b/core/java/android/view/ViewDebug.java @@ -1235,10 +1235,11 @@ public class ViewDebug { for (int j = 0; j < count; j++) { final FlagToString flagMapping = mapping[j]; final boolean ifTrue = flagMapping.outputIf(); - final boolean test = (intValue & flagMapping.mask()) == flagMapping.equals(); + final int maskResult = intValue & flagMapping.mask(); + final boolean test = maskResult == flagMapping.equals(); if ((test && ifTrue) || (!test && !ifTrue)) { final String name = flagMapping.name(); - final String value = ifTrue ? "true" : "false"; + final String value = "0x" + Integer.toHexString(maskResult); writeEntry(out, prefix, name, "", value); } } |