diff options
| author | Jason Sams <rjsams@android.com> | 2010-11-01 16:13:55 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-01 16:13:55 -0700 |
| commit | 7d5411fd3f08326d88142bc8f83ad41405893471 (patch) | |
| tree | 7c6af5a042eaf876a60ee1cc7aa42be0deb6471d /graphics | |
| parent | 30ce36ec701cbdd961fc6fc18c07cb1a48b46a46 (diff) | |
| parent | d26297fa562d8bb203df1bb5e6ded7f62c56cdb7 (diff) | |
| download | frameworks_base-7d5411fd3f08326d88142bc8f83ad41405893471.zip frameworks_base-7d5411fd3f08326d88142bc8f83ad41405893471.tar.gz frameworks_base-7d5411fd3f08326d88142bc8f83ad41405893471.tar.bz2 | |
Merge "Fix race condition in resize that was created when GetType for allocation and Types became async."
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index f8ad5cc..dfd6ac8 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -199,6 +199,7 @@ public class Allocation extends BaseObj { throw new IllegalStateException("Resize only support for 1D allocations at this time."); } mRS.nAllocationResize1D(mID, dimX); + mRS.finish(); // Necessary because resize is fifoed and update is async. int typeID = mRS.nAllocationGetType(mID); mType = new Type(typeID, mRS); |