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
diff --git a/graphics/java/android/renderscript/Script.java b/graphics/java/android/renderscript/Script.java
index 56893ac..bbf5e7e 100644
--- a/graphics/java/android/renderscript/Script.java
+++ b/graphics/java/android/renderscript/Script.java
@@ -16,11 +16,11 @@
package android.renderscript;
-/** @deprecated renderscript is deprecated in J
+/**
*
**/
public class Script extends BaseObj {
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -29,7 +29,7 @@
mRS.nScriptInvoke(getID(mRS), slot);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -43,7 +43,7 @@
}
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -77,7 +77,7 @@
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param va
@@ -92,7 +92,7 @@
}
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -102,7 +102,7 @@
mRS.nScriptSetVarF(getID(mRS), index, v);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -112,7 +112,7 @@
mRS.nScriptSetVarD(getID(mRS), index, v);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -122,7 +122,7 @@
mRS.nScriptSetVarI(getID(mRS), index, v);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -132,7 +132,7 @@
mRS.nScriptSetVarJ(getID(mRS), index, v);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -142,7 +142,7 @@
mRS.nScriptSetVarI(getID(mRS), index, v ? 1 : 0);
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -152,7 +152,7 @@
mRS.nScriptSetVarObj(getID(mRS), index, (o == null) ? 0 : o.getID(mRS));
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -162,7 +162,7 @@
mRS.nScriptSetVarV(getID(mRS), index, v.getData());
}
- /** @deprecated renderscript is deprecated in J
+ /**
* Only intended for use by generated reflected code.
*
* @param index
@@ -174,8 +174,6 @@
mRS.nScriptSetVarVE(getID(mRS), index, v.getData(), e.getID(mRS), dims);
}
- /** @deprecated renderscript is deprecated in J
- */
public void setTimeZone(String timeZone) {
mRS.validate();
try {