summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Napier <nobody@android.com>2009-05-13 15:35:28 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-13 15:35:28 -0700
commit370e92caec0bd42f16c6477b85ba02f5b89a1d7f (patch)
tree46bb9b32069d5c517e8c757943b417f64fd3fc7e
parent5369ad6f5e4e9f972b30fb8f16e90557ef8431b0 (diff)
parent7567a7453e853eca75a7162bbb87bfd0d7a5aafe (diff)
downloadframeworks_base-370e92caec0bd42f16c6477b85ba02f5b89a1d7f.zip
frameworks_base-370e92caec0bd42f16c6477b85ba02f5b89a1d7f.tar.gz
frameworks_base-370e92caec0bd42f16c6477b85ba02f5b89a1d7f.tar.bz2
am 7567a74: AI 148803: Update 1.xml and 2.xml for methods that take Gene
Merge commit '7567a7453e853eca75a7162bbb87bfd0d7a5aafe' * commit '7567a7453e853eca75a7162bbb87bfd0d7a5aafe': AI 148803: Update 1.xml and 2.xml for methods that take Generic Type Varargs. This will allow the CTS Signature Test to be run against older android releases.
-rw-r--r--api/1.xml4
-rw-r--r--api/2.xml4
2 files changed, 4 insertions, 4 deletions
diff --git a/api/1.xml b/api/1.xml
index b196ac7..02e8eac 100644
--- a/api/1.xml
+++ b/api/1.xml
@@ -88531,7 +88531,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="predicates" type="com.android.internal.util.Predicate...">
+<parameter name="predicates" type="com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...">
</parameter>
</method>
<method name="build"
@@ -169208,7 +169208,7 @@
>
<parameter name="loader" type="java.lang.ClassLoader">
</parameter>
-<parameter name="interfaces" type="java.lang.Class...">
+<parameter name="interfaces" type="java.lang.Class&lt;?&gt;...">
</parameter>
<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
</exception>
diff --git a/api/2.xml b/api/2.xml
index b9736fe..65e7cec 100644
--- a/api/2.xml
+++ b/api/2.xml
@@ -88575,7 +88575,7 @@
deprecated="not deprecated"
visibility="public"
>
-<parameter name="predicates" type="com.android.internal.util.Predicate...">
+<parameter name="predicates" type="com.android.internal.util.Predicate&lt;android.test.suitebuilder.TestMethod&gt;...">
</parameter>
</method>
<method name="build"
@@ -169353,7 +169353,7 @@
>
<parameter name="loader" type="java.lang.ClassLoader">
</parameter>
-<parameter name="interfaces" type="java.lang.Class...">
+<parameter name="interfaces" type="java.lang.Class&lt;?&gt;...">
</parameter>
<exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException">
</exception>