diff options
| author | John Reck <jreck@google.com> | 2014-09-05 22:38:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-05 22:38:42 +0000 |
| commit | 4e849178ef35687d0ce679487d8cfb6c5521fe3b (patch) | |
| tree | 8646cb6f9846524d90c7bb11f1d2d808ec55eb07 /core/jni | |
| parent | d89c5ad3d38d15f9d33fc3e0a004ad9d85e9e3cc (diff) | |
| parent | ec845a215e343cdb3b2e4c7b6aff7b24beb0236b (diff) | |
| download | frameworks_base-4e849178ef35687d0ce679487d8cfb6c5521fe3b.zip frameworks_base-4e849178ef35687d0ce679487d8cfb6c5521fe3b.tar.gz frameworks_base-4e849178ef35687d0ce679487d8cfb6c5521fe3b.tar.bz2 | |
Merge "Fix race condition" into lmp-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android_view_ThreadedRenderer.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/jni/android_view_ThreadedRenderer.cpp b/core/jni/android_view_ThreadedRenderer.cpp index 7e6d335..a8edb77 100644 --- a/core/jni/android_view_ThreadedRenderer.cpp +++ b/core/jni/android_view_ThreadedRenderer.cpp @@ -158,9 +158,11 @@ public: // Marks the start of a frame, which will update the frame time and move all // next frame animations into the current frame - virtual void startFrame() { - mRootNode->doAttachAnimatingNodes(this); - AnimationContext::startFrame(); + virtual void startFrame(TreeInfo::TraversalMode mode) { + if (mode == TreeInfo::MODE_FULL) { + mRootNode->doAttachAnimatingNodes(this); + } + AnimationContext::startFrame(mode); } // Runs any animations still left in mCurrentFrameAnimations |