diff options
| author | Yang Ni <yangni@google.com> | 2016-04-22 19:48:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-22 19:48:33 +0000 |
| commit | 8ca763803d8960ddc9f6c498c3294e69aac0f7cf (patch) | |
| tree | e15c8855dbf0a34d3222328b14303974e0e167f9 /rs/java/android/renderscript/Allocation.java | |
| parent | 10f4f44efe0eeb47ea63471c221d7a765f55e3ae (diff) | |
| parent | 1b4df1697f0d9b5dadfa1aca6c50d845d701ed2c (diff) | |
Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/Allocation.java')
| -rw-r--r-- | rs/java/android/renderscript/Allocation.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 04ea8e5a663f..c0ea1324602b 100644 --- a/rs/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -392,8 +392,6 @@ public class Allocation extends BaseObj { protected void finalize() throws Throwable { RenderScript.registerNativeFree.invoke(RenderScript.sRuntime, mSize); - // Set mType null to avoid double-destroying it in case its finalizer races ahead - mType = null; super.finalize(); } @@ -2615,7 +2613,6 @@ public class Allocation extends BaseObj { if (mType != null && mOwningType) { mType.destroy(); - mType = null; } super.destroy(); |