summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-11-26 15:45:12 -0800
committerYing Wang <wangying@google.com>2013-11-26 15:47:43 -0800
commit1622981ca44693152e3f95e93a8e22a2216f65a1 (patch)
tree0a607cffcce016253db4457f702c2b347bc5b3fb
parent26606007be1c6e5f0dd57101fc4daeeafe30fc20 (diff)
downloadframeworks_base-1622981ca44693152e3f95e93a8e22a2216f65a1.zip
frameworks_base-1622981ca44693152e3f95e93a8e22a2216f65a1.tar.gz
frameworks_base-1622981ca44693152e3f95e93a8e22a2216f65a1.tar.bz2
Fix sdk build.
Change-Id: I11471213826b212b99c0ddba89a7f4cef110fcc4
-rw-r--r--graphics/java/android/renderscript/Allocation.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java
index eb09131..45dd25a 100644
--- a/graphics/java/android/renderscript/Allocation.java
+++ b/graphics/java/android/renderscript/Allocation.java
@@ -654,7 +654,7 @@ public class Allocation extends BaseObj {
* android.renderscript.Element} does not match the array's
* primitive type.
*
- * @param d the source data array
+ * @param array The source data array
*/
public void copyFrom(Object array) {
Trace.traceBegin(RenderScript.TRACE_TAG, "copyFrom");
@@ -1032,7 +1032,7 @@ public class Allocation extends BaseObj {
* @param yoff Y offset of the region to update in this Allocation
* @param w Width of the region to update
* @param h Height of the region to update
- * @param data to be placed into the Allocation
+ * @param array Data to be placed into the Allocation
*/
public void copy2DRangeFrom(int xoff, int yoff, int w, int h, Object array) {
Trace.traceBegin(RenderScript.TRACE_TAG, "copy2DRangeFrom");
@@ -1863,4 +1863,3 @@ public class Allocation extends BaseObj {
}
}
-