Merge "Add getName to renderscript base object"

2 files changed, 8 insertions, 0 deletions

diff --git a/api/current.txt b/api/current.txt
index 8e822f9ea9db..815fec8e47b2 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17046,6 +17046,7 @@ package android.renderscript {
 
   public class BaseObj {
     method public synchronized void destroy();
+    method public java.lang.String getName();
     method public void setName(java.lang.String);
   }
 
diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java
index 63e7dd1f74fa..2e55c48e6e18 100644
--- a/graphics/java/android/renderscript/BaseObj.java
+++ b/graphics/java/android/renderscript/BaseObj.java
@@ -97,6 +97,13 @@ public class BaseObj {
         }
     }
 
+    /**
+     * @return name of the renderscript object
+     */
+    public String getName() {
+        return mName;
+    }
+
     protected void finalize() throws Throwable {
         if (!mDestroyed) {
             if(mID != 0 && mRS.isAlive()) {