diff options
| -rw-r--r-- | core/java/android/view/GLES20Canvas.java | 8 | ||||
| -rw-r--r-- | core/java/android/view/GLRenderer.java | 1 | ||||
| -rw-r--r-- | core/java/android/view/HardwareCanvas.java | 28 | ||||
| -rw-r--r-- | core/java/android/view/RemoteGLRenderer.java | 1 | ||||
| -rw-r--r-- | core/jni/android_view_GLES20Canvas.cpp | 14 | ||||
| -rw-r--r-- | libs/hwui/Renderer.h | 22 |
6 files changed, 0 insertions, 74 deletions
diff --git a/core/java/android/view/GLES20Canvas.java b/core/java/android/view/GLES20Canvas.java index 584a04c..449318e 100644 --- a/core/java/android/view/GLES20Canvas.java +++ b/core/java/android/view/GLES20Canvas.java @@ -145,14 +145,6 @@ class GLES20Canvas extends HardwareCanvas { } } - @Override - public void setName(String name) { - super.setName(name); - nSetName(mRenderer, name); - } - - private static native void nSetName(int renderer, String name); - public static void setProperty(String name, String value) { nSetProperty(name, value); } diff --git a/core/java/android/view/GLRenderer.java b/core/java/android/view/GLRenderer.java index 3c459b6..1811111 100644 --- a/core/java/android/view/GLRenderer.java +++ b/core/java/android/view/GLRenderer.java @@ -810,7 +810,6 @@ public class GLRenderer extends HardwareRenderer { } else { if (mCanvas == null) { mCanvas = createCanvas(); - mCanvas.setName(mName); } setEnabled(true); diff --git a/core/java/android/view/HardwareCanvas.java b/core/java/android/view/HardwareCanvas.java index d23c770..2e972c5 100644 --- a/core/java/android/view/HardwareCanvas.java +++ b/core/java/android/view/HardwareCanvas.java @@ -27,7 +27,6 @@ import android.graphics.Rect; * @hide */ public abstract class HardwareCanvas extends Canvas { - private String mName; @Override public boolean isHardwareAccelerated() { @@ -40,33 +39,6 @@ public abstract class HardwareCanvas extends Canvas { } /** - * Specifies the name of this canvas. Naming the canvas is entirely - * optional but can be useful for debugging purposes. - * - * @param name The name of the canvas, can be null - * - * @see #getName() - * - * @hide - */ - public void setName(String name) { - mName = name; - } - - /** - * Returns the name of this canvas. - * - * @return The name of the canvas or null - * - * @see #setName(String) - * - * @hide - */ - public String getName() { - return mName; - } - - /** * Invoked before any drawing operation is performed in this canvas. * * @param dirty The dirty rectangle to update, can be null. diff --git a/core/java/android/view/RemoteGLRenderer.java b/core/java/android/view/RemoteGLRenderer.java index 0862458..2919775 100644 --- a/core/java/android/view/RemoteGLRenderer.java +++ b/core/java/android/view/RemoteGLRenderer.java @@ -601,7 +601,6 @@ public class RemoteGLRenderer extends HardwareRenderer { if (surfaceCreated) { if (mCanvas == null) { mCanvas = createCanvas(); - mCanvas.setName(mName); } setEnabled(true); initAtlas(); diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index b0b5a5c..32e0f3b 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -179,18 +179,6 @@ static jint android_view_GLES20Canvas_getStencilSize(JNIEnv* env, jobject clazz) return Stencil::getStencilSize(); } -static void android_view_GLES20Canvas_setName(JNIEnv* env, - jobject clazz, jint rendererPtr, jstring name) { - OpenGLRenderer* renderer = reinterpret_cast<OpenGLRenderer*>(rendererPtr); - if (name != NULL) { - const char* textArray = env->GetStringUTFChars(name, NULL); - renderer->setName(textArray); - env->ReleaseStringUTFChars(name, textArray); - } else { - renderer->setName(NULL); - } -} - static void android_view_GLES20Canvas_setProperty(JNIEnv* env, jobject clazz, jstring name, jstring value) { if (!Caches::hasInstance()) { @@ -1177,8 +1165,6 @@ static JNINativeMethod gMethods[] = { { "nPrepare", "(IZ)I", (void*) android_view_GLES20Canvas_prepare }, { "nPrepareDirty", "(IIIIIZ)I", (void*) android_view_GLES20Canvas_prepareDirty }, { "nFinish", "(I)V", (void*) android_view_GLES20Canvas_finish }, - { "nSetName", "(ILjava/lang/String;)V", - (void*) android_view_GLES20Canvas_setName }, { "nSetProperty", "(Ljava/lang/String;Ljava/lang/String;)V", (void*) android_view_GLES20Canvas_setProperty }, diff --git a/libs/hwui/Renderer.h b/libs/hwui/Renderer.h index 38e1c91..9d4e83e 100644 --- a/libs/hwui/Renderer.h +++ b/libs/hwui/Renderer.h @@ -57,26 +57,6 @@ public: virtual ~Renderer() {} /** - * Sets the name of this renderer. The name is optional and empty by default, for debugging - * purposes only. If the pointer is null the name is set to the empty string. - */ - void setName(const char * name) { - if (name) { - mName.setTo(name); - } else { - mName.clear(); - } - } - - /** - * Returns the name of this renderer as UTF8 string. - * The returned pointer is never null. - */ - const char* getName() const { - return mName.string(); - } - - /** * Indicates whether this renderer is recording drawing commands for later playback. * If this method returns true, the drawing commands are deferred. */ @@ -269,8 +249,6 @@ public: virtual status_t callDrawGLFunction(Functor* functor, Rect& dirty) = 0; private: - // Optional name of the renderer - String8 mName; }; // class Renderer }; // namespace uirenderer |