From 9d5e03db9929271f56ac4a0078d9474d7011efcd Mon Sep 17 00:00:00 2001
From: Jason Sams <rjsams@android.com>
Date: Tue, 3 Nov 2009 11:25:42 -0800
Subject: Fix RS bugs.  We were holding a pointer to the script text from the
 java vm. Move freeing of objects to before context teardown to allow
 allocations to clean up their data.

---
 libs/rs/rsObjectBase.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'libs/rs/rsObjectBase.cpp')

diff --git a/libs/rs/rsObjectBase.cpp b/libs/rs/rsObjectBase.cpp
index 1b442ba39a7e..b7d67cca4b3c 100644
--- a/libs/rs/rsObjectBase.cpp
+++ b/libs/rs/rsObjectBase.cpp
@@ -113,12 +113,7 @@ bool ObjectBase::decSysRef() const
 
 void ObjectBase::setName(const char *name)
 {
-    delete mName;
-    mName = NULL;
-    if (name) {
-        mName = new char[strlen(name) +1];
-        strcpy(mName, name);
-    }
+    setName(name, strlen(name));
 }
 
 void ObjectBase::setName(const char *name, uint32_t len)
-- 
cgit v1.2.3-59-g8ed1b