summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2014-05-16 14:46:07 -0700
committerJohn Reck <jreck@google.com>2014-05-16 14:46:07 -0700
commit44ac42a6c9c3aa2614ef2369cda2e3de989c1fe0 (patch)
tree0b9653d0e099d77a508326681ff3acf7810e851a /core
parent3fce73a866e58232b484ca26b58b1394b0121b6a (diff)
downloadframeworks_base-44ac42a6c9c3aa2614ef2369cda2e3de989c1fe0.zip
frameworks_base-44ac42a6c9c3aa2614ef2369cda2e3de989c1fe0.tar.gz
frameworks_base-44ac42a6c9c3aa2614ef2369cda2e3de989c1fe0.tar.bz2
Add missing fence()
Bug: 14995924 Change-Id: I991fe74f01468b1b7e34aee0455dc419637f5c8d
Diffstat (limited to 'core')
-rw-r--r--core/java/android/view/ViewRootImpl.java5
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) {