Merge "Unhide new RS apis." (bce8effe) · Commits · e / os / android_frameworks_base

api/current.txt

+17 −0

Original line number	Diff line number	Diff line
		@@ -17699,6 +17699,21 @@ package android.renderscript {
		method public void surfaceDestroyed(android.view.SurfaceHolder);
		}

		public class RSTextureView extends android.view.TextureView implements android.view.TextureView.SurfaceTextureListener {
		ctor public RSTextureView(android.content.Context);
		ctor public RSTextureView(android.content.Context, android.util.AttributeSet);
		method public android.renderscript.RenderScriptGL createRenderScriptGL(android.renderscript.RenderScriptGL.SurfaceConfig);
		method public void destroyRenderScriptGL();
		method public android.renderscript.RenderScriptGL getRenderScriptGL();
		method public void onSurfaceTextureAvailable(android.graphics.SurfaceTexture, int, int);
		method public void onSurfaceTextureDestroyed(android.graphics.SurfaceTexture);
		method public void onSurfaceTextureSizeChanged(android.graphics.SurfaceTexture, int, int);
		method public void onSurfaceTextureUpdated(android.graphics.SurfaceTexture);
		method public void pause();
		method public void resume();
		method public void setRenderScriptGL(android.renderscript.RenderScriptGL);
		}

		public class RenderScript {
		method public void contextDump();
		method public static android.renderscript.RenderScript create(android.content.Context);
		@@ -17746,6 +17761,7 @@ package android.renderscript {
		method public void pause();
		method public void resume();
		method public void setSurface(android.view.SurfaceHolder, int, int);
		method public void setSurfaceTexture(android.graphics.SurfaceTexture, int, int);
		}

		public static class RenderScriptGL.SurfaceConfig {
		@@ -17789,6 +17805,7 @@ package android.renderscript {

		public class Script extends android.renderscript.BaseObj {
		method public void bindAllocation(android.renderscript.Allocation, int);
		method protected void forEach(int, android.renderscript.Allocation, android.renderscript.Allocation, android.renderscript.FieldPacker);
		method protected void invoke(int);
		method protected void invoke(int, android.renderscript.FieldPacker);
		method public void setTimeZone(java.lang.String);

graphics/java/android/renderscript/RSTextureView.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,9 +29,9 @@ import android.util.Log;
		import android.view.TextureView;

		/**
		* The Surface View for a graphics renderscript (RenderScriptGL) to draw on.
		* The Texture View for a graphics renderscript (RenderScriptGL)
		* to draw on.
		*
		* @hide
		*/
		public class RSTextureView extends TextureView implements TextureView.SurfaceTextureListener {
		private RenderScriptGL mRS;

graphics/java/android/renderscript/RenderScriptGL.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -200,8 +200,6 @@ public class RenderScriptGL extends RenderScript {
		/**
		* Bind an os surface
		*
		* @hide
		*
		* @param w
		* @param h
		* @param sur

graphics/java/android/renderscript/Script.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -44,7 +44,6 @@ public class Script extends BaseObj {
		}

		/**
		* @hide
		* Only intended for use by generated reflected code.
		*
		* @param slot