diff options
| author | Yang Ni <yangni@google.com> | 2016-04-22 19:52:18 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-04-22 19:52:18 +0000 |
| commit | 888017db7739d8523182d47302eeffbdb066fe1e (patch) | |
| tree | 79e67ead08d6bf7efd686de4665a1b7255f928f7 /rs/java/android/renderscript/Allocation.java | |
| parent | 3cd052d38cfa3f113b7d0e842b3e5aafc9667e5f (diff) | |
| parent | 8ca763803d8960ddc9f6c498c3294e69aac0f7cf (diff) | |
Merge "Fixed BaseObj finalizer and destroy()" into nyc-dev
am: 8ca7638
* commit '8ca763803d8960ddc9f6c498c3294e69aac0f7cf':
Fixed BaseObj finalizer and destroy()
Change-Id: Id607034269102c84d673b7148beb0b050121e0bc
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(); |