commit 804b3d76c39eca09cbbd8b7c3fa1718e7ad094cc
author Alex Sakhartchouk <alexst@google.com> Wed Jul 27 09:50:35 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 27 09:50:35 2011 -0700
tree ef77207706b4ebfe0e8527f818401d537ae8f451
parent 525efbb29d1198d8562a6d070e1cdf88ce721e01
parent 0400b07c6bfc3fca49bc10db0a2040aba8664c8e

Merge "Add getName to renderscript base object"

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 8e822f9..815fec8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17046,6 +17046,7 @@
 
   public class BaseObj {
     method public synchronized void destroy();
+    method public java.lang.String getName();
     method public void setName(java.lang.String);
   }
 

graphics/java/android/renderscript/BaseObj.java

diff --git a/graphics/java/android/renderscript/BaseObj.java b/graphics/java/android/renderscript/BaseObj.java
index 63e7dd1..2e55c48 100644
--- a/graphics/java/android/renderscript/BaseObj.java
+++ b/graphics/java/android/renderscript/BaseObj.java
@@ -97,6 +97,13 @@
         }
     }
 
+    /**
+     * @return name of the renderscript object
+     */
+    public String getName() {
+        return mName;
+    }
+
     protected void finalize() throws Throwable {
         if (!mDestroyed) {
             if(mID != 0 && mRS.isAlive()) {