Merge "Properly use Long2 for "UInt2" for FieldPacker." into honeycomb
diff --git a/api/11.xml b/api/11.xml
index bfd637e..4f7bda3 100644
--- a/api/11.xml
+++ b/api/11.xml
@@ -168625,7 +168625,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="v" type="android.renderscript.Int2">
+<parameter name="v" type="android.renderscript.Long2">
</parameter>
</method>
<method name="addU32"
@@ -168638,7 +168638,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="v" type="android.renderscript.Int3">
+<parameter name="v" type="android.renderscript.Long3">
</parameter>
</method>
<method name="addU32"
@@ -168651,7 +168651,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="v" type="android.renderscript.Int4">
+<parameter name="v" type="android.renderscript.Long4">
</parameter>
</method>
<method name="addU64"
diff --git a/api/current.xml b/api/current.xml
index bfd637e..4f7bda3 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -168625,7 +168625,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="v" type="android.renderscript.Int2">
+<parameter name="v" type="android.renderscript.Long2">
</parameter>
</method>
<method name="addU32"
@@ -168638,7 +168638,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="v" type="android.renderscript.Int3">
+<parameter name="v" type="android.renderscript.Long3">
</parameter>
</method>
<method name="addU32"
@@ -168651,7 +168651,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="v" type="android.renderscript.Int4">
+<parameter name="v" type="android.renderscript.Long4">
</parameter>
</method>
<method name="addU64"
diff --git a/graphics/java/android/renderscript/FieldPacker.java b/graphics/java/android/renderscript/FieldPacker.java
index 2fb3d95..40628bc 100644
--- a/graphics/java/android/renderscript/FieldPacker.java
+++ b/graphics/java/android/renderscript/FieldPacker.java
@@ -233,16 +233,16 @@
addI32(v.w);
}
- public void addU32(Int2 v) {
+ public void addU32(Long2 v) {
addU32(v.x);
addU32(v.y);
}
- public void addU32(Int3 v) {
+ public void addU32(Long3 v) {
addU32(v.x);
addU32(v.y);
addU32(v.z);
}
- public void addU32(Int4 v) {
+ public void addU32(Long4 v) {
addU32(v.x);
addU32(v.y);
addU32(v.z);