diff options
| author | Jason Sams <rjsams@android.com> | 2010-10-21 14:06:55 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-10-21 21:17:30 -0700 |
| commit | b38d534873ca514f5a5230596c838aa37eca1568 (patch) | |
| tree | 4473cccf239e0a97597db92052508b2149309ad1 /libs/rs/rsElement.cpp | |
| parent | 4924aee9cb1c5988359f3162b6e89689c5b101e1 (diff) | |
| download | frameworks_base-b38d534873ca514f5a5230596c838aa37eca1568.zip frameworks_base-b38d534873ca514f5a5230596c838aa37eca1568.tar.gz frameworks_base-b38d534873ca514f5a5230596c838aa37eca1568.tar.bz2 | |
Fix refcounting bugs where the sys refcount
could be corrupted during async type creation.
Change-Id: If42828e92990598b0cb5da81c82ea513f94725f2
Fix stack object deletion bug.
Change-Id: I2c723aa5ad15e0c99dc9cd0cfbc7db80bace172a
Diffstat (limited to 'libs/rs/rsElement.cpp')
| -rw-r--r-- | libs/rs/rsElement.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/rs/rsElement.cpp b/libs/rs/rsElement.cpp index 9e6fbd5..dc021fc 100644 --- a/libs/rs/rsElement.cpp +++ b/libs/rs/rsElement.cpp @@ -30,8 +30,6 @@ using namespace android::renderscript; Element::Element(Context *rsc) : ObjectBase(rsc) { mBits = 0; - mAllocFile = __FILE__; - mAllocLine = __LINE__; mFields = NULL; mFieldCount = 0; mHasReference = false; @@ -140,7 +138,7 @@ Element *Element::createFromStream(Context *rsc, IStream *stream) for (uint32_t ct=0; ct < rsc->mStateElement.mElements.size(); ct++) { Element *ee = rsc->mStateElement.mElements[ct]; if(ee->isEqual(elem)) { - delete elem; + ObjectBase::checkDelete(elem); ee->incUserRef(); return ee; } |