am 81155da2: Merge "Remove dead code" (bab711b5) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+0 −8

Original line number	Diff line number	Diff line
		@@ -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);
		}

+0 −1

Original line number	Diff line number	Diff line
		@@ -810,7 +810,6 @@ public class GLRenderer extends HardwareRenderer {
		} else {
		if (mCanvas == null) {
		mCanvas = createCanvas();
		mCanvas.setName(mName);
		}
		setEnabled(true);

+0 −28

Original line number	Diff line number	Diff line
		@@ -27,7 +27,6 @@ import android.graphics.Rect;
		* @hide
		*/
		public abstract class HardwareCanvas extends Canvas {
		private String mName;

		@Override
		public boolean isHardwareAccelerated() {
		@@ -39,33 +38,6 @@ public abstract class HardwareCanvas extends Canvas {
		throw new UnsupportedOperationException();
		}

		/**
		* 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.
		*

+0 −1

Original line number	Diff line number	Diff line
		@@ -601,7 +601,6 @@ public class RemoteGLRenderer extends HardwareRenderer {
		if (surfaceCreated) {
		if (mCanvas == null) {
		mCanvas = createCanvas();
		mCanvas.setName(mName);
		}
		setEnabled(true);
		initAtlas();

+0 −14

Original line number	Diff line number	Diff line
		@@ -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 },