diff options
| -rw-r--r-- | core/java/android/view/ThreadedRenderer.java | 4 | ||||
| -rw-r--r-- | libs/hwui/renderthread/CanvasContext.cpp | 4 | ||||
| -rw-r--r-- | libs/hwui/renderthread/DrawFrameTask.h | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/core/java/android/view/ThreadedRenderer.java b/core/java/android/view/ThreadedRenderer.java index 5c67da9d0d93..bfab65493f15 100644 --- a/core/java/android/view/ThreadedRenderer.java +++ b/core/java/android/view/ThreadedRenderer.java @@ -64,9 +64,9 @@ public class ThreadedRenderer extends HardwareRenderer { // Keep in sync with DrawFrameTask.h SYNC_* flags // Nothing interesting to report - private static final int SYNC_OK = 0x0; + private static final int SYNC_OK = 0; // Needs a ViewRoot invalidate - private static final int SYNC_INVALIDATE_REQUIRED = 0x1; + private static final int SYNC_INVALIDATE_REQUIRED = 1 << 0; private static final String[] VISUALIZERS = { PROFILE_PROPERTY_VISUALIZE_BARS, diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index fe4edf839c06..281a8e151a75 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -148,9 +148,7 @@ void CanvasContext::prepareTree(TreeInfo& info) { info.out.canDrawThisFrame = !runningBehind; if (info.out.hasAnimations || !info.out.canDrawThisFrame) { - if (info.out.hasFunctors) { - info.out.requiresUiRedraw = true; - } else if (!info.out.requiresUiRedraw) { + if (!info.out.requiresUiRedraw) { // If animationsNeedsRedraw is set don't bother posting for an RT anim // as we will just end up fighting the UI thread. mRenderThread.postFrameCallback(this); diff --git a/libs/hwui/renderthread/DrawFrameTask.h b/libs/hwui/renderthread/DrawFrameTask.h index 96f0add4c08c..243cc5d1e3cc 100644 --- a/libs/hwui/renderthread/DrawFrameTask.h +++ b/libs/hwui/renderthread/DrawFrameTask.h @@ -41,7 +41,7 @@ class RenderThread; enum SyncResult { kSync_OK = 0, - kSync_UIRedrawRequired = 1 << 1, + kSync_UIRedrawRequired = 1 << 0, }; /* |