Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Deprecate"

Browse Source 
This reverts commit a0c2eb27b4.

Conflicts:

	api/current.txt
	graphics/java/android/renderscript/Element.java
	graphics/java/android/renderscript/Script.java

Change-Id: I3c8fa62b12da95b3dbc842b5284dbed65d3cf963
This commit is contained in:
Stephen Hines
2012-05-07 15:34:29 -07:00
parent b3482ffbee
commit 9c9ad3f8c2
50 changed files with 960 additions and 1173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/java/android/renderscript/Script.java
View File

@@ -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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param slot
@@ -77,7 +77,7 @@ public class Script extends BaseObj {
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param va
@@ -92,7 +92,7 @@ public class Script extends BaseObj {
}
}
/** @deprecated renderscript is deprecated in J
/**
* Only intended for use by generated reflected code.
*
* @param index
@@ -102,7 +102,7 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 @@ public class Script extends BaseObj {
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 {