diff options
| author | John Reck <jreck@google.com> | 2014-05-16 21:47:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-16 21:47:33 +0000 |
| commit | 4b300d7dcbe47035ce6cea3fab6eff76bdc4d803 (patch) | |
| tree | 84799bbfadb1fbc54b8344484758307ed90c88f7 /core | |
| parent | ac13a9b741a8af9431ee8953d97f7a0fd38aa5c2 (diff) | |
| parent | 44ac42a6c9c3aa2614ef2369cda2e3de989c1fe0 (diff) | |
| download | frameworks_base-4b300d7dcbe47035ce6cea3fab6eff76bdc4d803.zip frameworks_base-4b300d7dcbe47035ce6cea3fab6eff76bdc4d803.tar.gz frameworks_base-4b300d7dcbe47035ce6cea3fab6eff76bdc4d803.tar.bz2 | |
Merge "Add missing fence()"
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 9b09d85..35b4bc5 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -668,6 +668,11 @@ public final class ViewRootImpl implements ViewParent, public void detachFunctor(long functor) { // TODO: Make the resize buffer some other way to not need this block mBlockResizeBuffer = true; + if (mAttachInfo.mHardwareRenderer != null) { + // Fence so that any pending invokeFunctor() messages will be processed + // before we return from detachFunctor. + mAttachInfo.mHardwareRenderer.fence(); + } } public boolean invokeFunctor(long functor, boolean waitForCompletion) { |