Merge "Improve RS documentation." into jb-mr2-dev (ea45ab6f) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/Allocation.java

+295 −272

File changed.

Preview size limit exceeded, changes collapsed.

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ import android.graphics.BitmapFactory;
		import android.util.TypedValue;

		/**
		* Only intended for use by generated reflected code.
		*
		**/
		public class AllocationAdapter extends Allocation {

+7 −9

Original line number	Diff line number	Diff line
		@@ -19,9 +19,9 @@ package android.renderscript;
		import android.util.Log;

		/**
		* BaseObj is the base class for interfacing with native renderscript objects.
		* It primarly contains code for tracking the native object ID and forcably
		* disconecting the object from the native allocation for early cleanup.
		* BaseObj is the base class for all RenderScript objects owned by a RS context.
		* It is responsible for lifetime management and resource tracking. This class
		* should not be used by a user application.
		*
		**/
		public class BaseObj {
		@@ -75,8 +75,7 @@ public class BaseObj {

		/**
		* setName assigns a name to an object. This object can later be looked up
		* by this name. This name will also be retained if the object is written
		* to an A3D file.
		* by this name.
		*
		* @param name The name to assign to the object.
		*/
		@@ -125,10 +124,9 @@ public class BaseObj {
		}

		/**
		* destroy disconnects the object from the native object effectively
		* rendering this java object dead. The primary use is to force immediate
		* cleanup of resources when it is believed the GC will not respond quickly
		* enough.
		* Frees any native resources associated with this object. The
		* primary use is to force immediate cleanup of resources when it is
		* believed the GC will not respond quickly enough.
		*/
		synchronized public void destroy() {
		if(mDestroyed) {

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.util.Log;


		/**
		* Class for exposing the native Renderscript byte2 type back to the Android system.
		* Class for exposing the native RenderScript byte2 type back to the Android system.
		*
		**/
		public class Byte2 {

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.util.Log;


		/**
		* Class for exposing the native Renderscript byte3 type back to the Android system.
		* Class for exposing the native RenderScript byte3 type back to the Android system.
		*
		**/
		public class Byte3 {