Merge "Cleanup API typo" into klp-dev (c2b582c0) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −3

Original line number	Diff line number	Diff line
		@@ -22395,7 +22395,7 @@ package android.renderscript {
		}

		public final class ScriptIntrinsicColorMatrix extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element);
		method public static deprecated android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element);
		method public static android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript);
		method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation);
		method public android.renderscript.Script.KernelID getKernelID();
		@@ -22429,9 +22429,9 @@ package android.renderscript {
		public final class ScriptIntrinsicHistogram extends android.renderscript.ScriptIntrinsic {
		method public static android.renderscript.ScriptIntrinsicHistogram create(android.renderscript.RenderScript, android.renderscript.Element);
		method public void forEach(android.renderscript.Allocation);
		method public void forEach_dot(android.renderscript.Allocation);
		method public void forEach_Dot(android.renderscript.Allocation);
		method public android.renderscript.Script.FieldID getFieldID_Input();
		method public android.renderscript.Script.KernelID getKernelID_seperate();
		method public android.renderscript.Script.KernelID getKernelID_Separate();
		method public void setDotCoefficients(float, float, float, float);
		method public void setOutput(android.renderscript.Allocation);
		}

graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -56,8 +56,12 @@ public final class ScriptIntrinsicColorMatrix extends ScriptIntrinsic {
		* this parameter is ignored. The Element type check is
		* performed in the kernel launch.
		*
		* @deprecated Use the single argument version as Element is now
		* ignored.
		*
		* @return ScriptIntrinsicColorMatrix
		*/
		@Deprecated
		public static ScriptIntrinsicColorMatrix create(RenderScript rs, Element e) {
		return create(rs);
		}

graphics/java/android/renderscript/ScriptIntrinsicHistogram.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic {
		*
		* @param ain The input image
		*/
		public void forEach_dot(Allocation ain) {
		public void forEach_Dot(Allocation ain) {
		if (mOut.getType().getElement().getVectorSize() != 1) {
		throw new RSIllegalArgumentException("Output vector size must be one.");
		}
		@@ -170,7 +170,7 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic {
		*
		* @return Script.KernelID The KernelID object.
		*/
		public Script.KernelID getKernelID_seperate() {
		public Script.KernelID getKernelID_Separate() {
		return createKernelID(0, 3, null, null);
		}