Merge "Deprecate" (d6d6d35c) · Commits · e / os / android_frameworks_base

api/current.txt

+525 −570

File changed.

Preview size limit exceeded, changes collapsed.

graphics/java/android/renderscript/Allocation.java

+76 −70

File changed.

Preview size limit exceeded, changes collapsed.

graphics/java/android/renderscript/AllocationAdapter.java

+10 −6

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

		/**
		/** @deprecated renderscript is deprecated in J
		*
		**/
		public class AllocationAdapter extends Allocation {
		@@ -129,7 +129,7 @@ public class AllocationAdapter extends Allocation {
		mSelectedZ = 0;
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Set the active LOD. The LOD must be within the range for the
		* type being adapted. The base allocation must have mipmaps.
		*
		@@ -149,7 +149,7 @@ public class AllocationAdapter extends Allocation {
		initLOD(lod);
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Set the active Face. The base allocation must be of a type
		* that includes faces.
		*
		@@ -169,7 +169,7 @@ public class AllocationAdapter extends Allocation {
		mSelectedFace = cf;
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Set the active Y. The y value must be within the range for
		* the allocation being adapted. The base allocation must
		* contain the Y dimension.
		@@ -190,7 +190,7 @@ public class AllocationAdapter extends Allocation {
		mSelectedY = y;
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Set the active Z. The z value must be within the range for
		* the allocation being adapted. The base allocation must
		* contain the Z dimension.
		@@ -211,6 +211,8 @@ public class AllocationAdapter extends Allocation {
		mSelectedZ = z;
		}

		/** @deprecated renderscript is deprecated in J
		*/
		static public AllocationAdapter create1D(RenderScript rs, Allocation a) {
		rs.validate();
		AllocationAdapter aa = new AllocationAdapter(0, rs, a);
		@@ -222,6 +224,8 @@ public class AllocationAdapter extends Allocation {
		return aa;
		}

		/** @deprecated renderscript is deprecated in J
		*/
		static public AllocationAdapter create2D(RenderScript rs, Allocation a) {
		android.util.Log.e("rs", "create2d " + a);
		rs.validate();
		@@ -235,7 +239,7 @@ public class AllocationAdapter extends Allocation {
		}


		/**
		/** @deprecated renderscript is deprecated in J
		* Override the Allocation resize. Resizing adapters is not
		* allowed and will throw a RSInvalidStateException.
		*

graphics/java/android/renderscript/BaseObj.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ package android.renderscript;

		import android.util.Log;

		/**
		/** @deprecated renderscript is deprecated in J
		* 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.
		@@ -39,7 +39,7 @@ public class BaseObj {
		mID = id;
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Lookup the native object ID for this object. Primarily used by the
		* generated reflected code.
		*
		@@ -73,7 +73,7 @@ public class BaseObj {
		private String mName;
		RenderScript mRS;

		/**
		/** @deprecated renderscript is deprecated in J
		* 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.
		@@ -103,7 +103,7 @@ public class BaseObj {
		}
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* @return name of the renderscript object
		*/
		public String getName() {
		@@ -124,7 +124,7 @@ public class BaseObj {
		super.finalize();
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* 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
		@@ -138,7 +138,7 @@ public class BaseObj {
		mRS.nObjDestroy(mID);
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* If an object came from an a3d file, java fields need to be
		* created with objects from the native layer
		*/
		@@ -147,7 +147,7 @@ public class BaseObj {
		mName = mRS.nGetName(getID(mRS));
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Calculates the hash code value for a BaseObj.
		*
		* @return int
		@@ -157,7 +157,7 @@ public class BaseObj {
		return mID;
		}

		/**
		/** @deprecated renderscript is deprecated in J
		* Compare the current BaseObj with another BaseObj for equality.
		*
		* @param obj The object to check equality with.

graphics/java/android/renderscript/Byte2.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import java.lang.Math;
		import android.util.Log;


		/**
		/** @deprecated renderscript is deprecated in J
		* Class for exposing the native Renderscript byte2 type back to the Android system.
		*
		**/