From 9c9ad3f8c218954e46aab81f9af7834cea5675ca Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Mon, 7 May 2012 15:34:29 -0700 Subject: Revert "Deprecate" This reverts commit a0c2eb27b408660b02fa248943166d6c7e447908. Conflicts: api/current.txt graphics/java/android/renderscript/Element.java graphics/java/android/renderscript/Script.java Change-Id: I3c8fa62b12da95b3dbc842b5284dbed65d3cf963 --- graphics/java/android/renderscript/ProgramFragment.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'graphics/java/android/renderscript/ProgramFragment.java') diff --git a/graphics/java/android/renderscript/ProgramFragment.java b/graphics/java/android/renderscript/ProgramFragment.java index 0427c19babfc..fa6e2d4c1847 100644 --- a/graphics/java/android/renderscript/ProgramFragment.java +++ b/graphics/java/android/renderscript/ProgramFragment.java @@ -20,7 +20,7 @@ package android.renderscript; import android.util.Log; -/** @deprecated renderscript is deprecated in J +/** *

The Renderscript fragment program, also known as fragment shader is responsible * for manipulating pixel data in a user defined way. It's constructed from a GLSL * shader string containing the program body, textures inputs, and a Type object @@ -42,7 +42,7 @@ public class ProgramFragment extends Program { } public static class Builder extends BaseProgramBuilder { - /** @deprecated renderscript is deprecated in J + /** * Create a builder object. * * @param rs Context to which the program will belong. @@ -51,7 +51,7 @@ public class ProgramFragment extends Program { super(rs); } - /** @deprecated renderscript is deprecated in J + /** * Creates ProgramFragment from the current state of the builder * * @return ProgramFragment -- cgit v1.2.3