diff options
author | Brian Carlstrom <bdc@google.com> | 2010-08-04 15:44:39 -0700 |
---|---|---|
committer | Brian Carlstrom <bdc@google.com> | 2010-08-04 23:47:38 -0700 |
commit | 3c7c351a6217ac48b741740167c201a679a0ca65 (patch) | |
tree | f539d70e0a46249f01dd6fb45563f1ebc4bed706 /api/9.xml | |
parent | cde66df44240cfe5a7bec12ac52464c3bf26c14f (diff) | |
download | frameworks_base-3c7c351a6217ac48b741740167c201a679a0ca65.zip frameworks_base-3c7c351a6217ac48b741740167c201a679a0ca65.tar.gz frameworks_base-3c7c351a6217ac48b741740167c201a679a0ca65.tar.bz2 |
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d
Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
Diffstat (limited to 'api/9.xml')
-rw-r--r-- | api/9.xml | 1276 |
1 files changed, 41 insertions, 1235 deletions
@@ -216582,33 +216582,6 @@ </package> <package name="dalvik.system" > -<class name="AllocationLimitError" - extends="java.lang.VirtualMachineError" - abstract="false" - static="false" - final="false" - deprecated="deprecated" - visibility="public" -> -<constructor name="AllocationLimitError" - type="dalvik.system.AllocationLimitError" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<constructor name="AllocationLimitError" - type="dalvik.system.AllocationLimitError" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="detailMessage" type="java.lang.String"> -</parameter> -</constructor> -</class> <class name="DexClassLoader" extends="java.lang.ClassLoader" abstract="false" @@ -216788,1010 +216761,6 @@ </parameter> </constructor> </class> -<class name="PotentialDeadlockError" - extends="java.lang.VirtualMachineError" - abstract="false" - static="false" - final="false" - deprecated="deprecated" - visibility="public" -> -<constructor name="PotentialDeadlockError" - type="dalvik.system.PotentialDeadlockError" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<constructor name="PotentialDeadlockError" - type="dalvik.system.PotentialDeadlockError" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="detailMessage" type="java.lang.String"> -</parameter> -</constructor> -</class> -<class name="StaleDexCacheError" - extends="java.lang.VirtualMachineError" - abstract="false" - static="false" - final="false" - deprecated="deprecated" - visibility="public" -> -<constructor name="StaleDexCacheError" - type="dalvik.system.StaleDexCacheError" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<constructor name="StaleDexCacheError" - type="dalvik.system.StaleDexCacheError" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="detailMessage" type="java.lang.String"> -</parameter> -</constructor> -</class> -<class name="TemporaryDirectory" - extends="java.lang.Object" - abstract="false" - static="false" - final="false" - deprecated="deprecated" - visibility="public" -> -<constructor name="TemporaryDirectory" - type="dalvik.system.TemporaryDirectory" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<method name="setUpDirectory" - return="void" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="baseDir" type="java.lang.String"> -</parameter> -</method> -<method name="setUpDirectory" - return="void" - abstract="false" - native="false" - synchronized="true" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="baseDir" type="java.io.File"> -</parameter> -</method> -</class> -<class name="TouchDex" - extends="java.lang.Object" - abstract="false" - static="false" - final="false" - deprecated="deprecated" - visibility="public" -> -<constructor name="TouchDex" - type="dalvik.system.TouchDex" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<method name="main" - return="void" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="args" type="java.lang.String[]"> -</parameter> -</method> -<method name="start" - return="int" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="dexFiles" type="java.lang.String"> -</parameter> -</method> -</class> -<class name="VMDebug" - extends="java.lang.Object" - abstract="false" - static="false" - final="true" - deprecated="deprecated" - visibility="public" -> -<method name="dumpHprofData" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="fileName" type="java.lang.String"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="getAllocCount" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="kind" type="int"> -</parameter> -</method> -<method name="getInstructionCount" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="counts" type="int[]"> -</parameter> -</method> -<method name="getLoadedClassCount" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="isDebuggerConnected" - return="boolean" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="isDebuggingEnabled" - return="boolean" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="lastDebuggerActivity" - return="long" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="printLoadedClasses" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="flags" type="int"> -</parameter> -</method> -<method name="resetAllocCount" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="kinds" type="int"> -</parameter> -</method> -<method name="resetInstructionCount" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="setAllocationLimit" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="limit" type="int"> -</parameter> -</method> -<method name="setGlobalAllocationLimit" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="limit" type="int"> -</parameter> -</method> -<method name="startAllocCounting" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="startEmulatorTracing" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="startInstructionCounting" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="startMethodTracing" - return="void" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="deprecated" - visibility="public" -> -</method> -<method name="startMethodTracing" - return="void" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="traceFileName" type="java.lang.String"> -</parameter> -<parameter name="bufferSize" type="int"> -</parameter> -<parameter name="flags" type="int"> -</parameter> -</method> -<method name="stopAllocCounting" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="stopEmulatorTracing" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="stopInstructionCounting" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="stopMethodTracing" - return="void" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="threadCpuTimeNanos" - return="long" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<field name="DEFAULT_METHOD_TRACE_FILE_NAME" - type="java.lang.String" - transient="false" - volatile="false" - value=""/sdcard/dmtrace.trace"" - static="true" - final="true" - deprecated="deprecated" - visibility="public" -> -</field> -<field name="KIND_ALL_COUNTS" - type="int" - transient="false" - volatile="false" - value="-1" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_ALLOCATED_BYTES" - type="int" - transient="false" - volatile="false" - value="2" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_ALLOCATED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="1" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_CLASS_INIT_COUNT" - type="int" - transient="false" - volatile="false" - value="32" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_CLASS_INIT_TIME" - type="int" - transient="false" - volatile="false" - value="64" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_EXT_ALLOCATED_BYTES" - type="int" - transient="false" - volatile="false" - value="8192" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_EXT_ALLOCATED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="4096" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_EXT_FREED_BYTES" - type="int" - transient="false" - volatile="false" - value="32768" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_EXT_FREED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="16384" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_FREED_BYTES" - type="int" - transient="false" - volatile="false" - value="8" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_FREED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="4" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_GLOBAL_GC_INVOCATIONS" - type="int" - transient="false" - volatile="false" - value="16" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_ALLOCATED_BYTES" - type="int" - transient="false" - volatile="false" - value="131072" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_ALLOCATED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="65536" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_CLASS_INIT_COUNT" - type="int" - transient="false" - volatile="false" - value="2097152" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_CLASS_INIT_TIME" - type="int" - transient="false" - volatile="false" - value="4194304" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_EXT_ALLOCATED_BYTES" - type="int" - transient="false" - volatile="false" - value="536870912" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_EXT_ALLOCATED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="268435456" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_EXT_FREED_BYTES" - type="int" - transient="false" - volatile="false" - value="-2147483648" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_EXT_FREED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="1073741824" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_FREED_BYTES" - type="int" - transient="false" - volatile="false" - value="524288" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_FREED_OBJECTS" - type="int" - transient="false" - volatile="false" - value="262144" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="KIND_THREAD_GC_INVOCATIONS" - type="int" - transient="false" - volatile="false" - value="1048576" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="TRACE_COUNT_ALLOCS" - type="int" - transient="false" - volatile="false" - value="1" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -</class> -<class name="VMRuntime" - extends="java.lang.Object" - abstract="false" - static="false" - final="true" - deprecated="deprecated" - visibility="public" -> -<method name="gcSoftReferences" - return="void" - abstract="false" - native="true" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getExternalBytesAllocated" - return="long" - abstract="false" - native="true" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getMinimumHeapSize" - return="long" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getRuntime" - return="dalvik.system.VMRuntime" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getTargetHeapUtilization" - return="float" - abstract="false" - native="true" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="runFinalizationSync" - return="void" - abstract="false" - native="true" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="setMinimumHeapSize" - return="long" - abstract="false" - native="false" - synchronized="true" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="size" type="long"> -</parameter> -</method> -<method name="setTargetHeapUtilization" - return="float" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="newTarget" type="float"> -</parameter> -</method> -</class> -<class name="VMStack" - extends="java.lang.Object" - abstract="false" - static="false" - final="true" - deprecated="deprecated" - visibility="public" -> -<constructor name="VMStack" - type="dalvik.system.VMStack" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<method name="getCallingClassLoader" - return="java.lang.ClassLoader" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getCallingClassLoader2" - return="java.lang.ClassLoader" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="getClasses" - return="java.lang.Class<?>[]" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="maxDepth" type="int"> -</parameter> -<parameter name="stopAtPrivileged" type="boolean"> -</parameter> -</method> -<method name="getThreadStackTrace" - return="java.lang.StackTraceElement[]" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="t" type="java.lang.Thread"> -</parameter> -</method> -</class> -<class name="Zygote" - extends="java.lang.Object" - abstract="false" - static="false" - final="false" - deprecated="deprecated" - visibility="public" -> -<method name="fork" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="forkAndSpecialize" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="uid" type="int"> -</parameter> -<parameter name="gid" type="int"> -</parameter> -<parameter name="gids" type="int[]"> -</parameter> -<parameter name="debugFlags" type="int"> -</parameter> -<parameter name="rlimits" type="int[][]"> -</parameter> -</method> -<method name="forkAndSpecialize" - return="int" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="deprecated" - visibility="public" -> -<parameter name="uid" type="int"> -</parameter> -<parameter name="gid" type="int"> -</parameter> -<parameter name="gids" type="int[]"> -</parameter> -<parameter name="enableDebugger" type="boolean"> -</parameter> -<parameter name="rlimits" type="int[][]"> -</parameter> -</method> -<method name="forkSystemServer" - return="int" - abstract="false" - native="true" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="uid" type="int"> -</parameter> -<parameter name="gid" type="int"> -</parameter> -<parameter name="gids" type="int[]"> -</parameter> -<parameter name="debugFlags" type="int"> -</parameter> -<parameter name="rlimits" type="int[][]"> -</parameter> -</method> -<method name="forkSystemServer" - return="int" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="deprecated" - visibility="public" -> -<parameter name="uid" type="int"> -</parameter> -<parameter name="gid" type="int"> -</parameter> -<parameter name="gids" type="int[]"> -</parameter> -<parameter name="enableDebugger" type="boolean"> -</parameter> -<parameter name="rlimits" type="int[][]"> -</parameter> -</method> -<field name="DEBUG_ENABLE_ASSERT" - type="int" - transient="false" - volatile="false" - value="4" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="DEBUG_ENABLE_CHECKJNI" - type="int" - transient="false" - volatile="false" - value="2" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="DEBUG_ENABLE_DEBUGGER" - type="int" - transient="false" - volatile="false" - value="1" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="DEBUG_ENABLE_SAFEMODE" - type="int" - transient="false" - volatile="false" - value="8" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -</class> </package> <package name="java.awt.font" > @@ -232422,7 +231391,7 @@ > </method> <method name="getClasses" - return="java.lang.Class[]" + return="java.lang.Class<?>[]" abstract="false" native="false" synchronized="false" @@ -232453,7 +231422,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="parameterTypes" type="java.lang.Class..."> +<parameter name="parameterTypes" type="java.lang.Class<?>..."> </parameter> <exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException"> </exception> @@ -232461,7 +231430,7 @@ </exception> </method> <method name="getConstructors" - return="java.lang.reflect.Constructor[]" + return="java.lang.reflect.Constructor<?>[]" abstract="false" native="false" synchronized="false" @@ -232485,7 +231454,7 @@ > </method> <method name="getDeclaredClasses" - return="java.lang.Class[]" + return="java.lang.Class<?>[]" abstract="false" native="false" synchronized="false" @@ -232507,7 +231476,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="parameterTypes" type="java.lang.Class..."> +<parameter name="parameterTypes" type="java.lang.Class<?>..."> </parameter> <exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException"> </exception> @@ -232515,7 +231484,7 @@ </exception> </method> <method name="getDeclaredConstructors" - return="java.lang.reflect.Constructor[]" + return="java.lang.reflect.Constructor<?>[]" abstract="false" native="false" synchronized="false" @@ -232569,7 +231538,7 @@ > <parameter name="name" type="java.lang.String"> </parameter> -<parameter name="parameterTypes" type="java.lang.Class..."> +<parameter name="parameterTypes" type="java.lang.Class<?>..."> </parameter> <exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException"> </exception> @@ -232697,7 +231666,7 @@ > </method> <method name="getInterfaces" - return="java.lang.Class[]" + return="java.lang.Class<?>[]" abstract="false" native="true" synchronized="false" @@ -232719,7 +231688,7 @@ > <parameter name="name" type="java.lang.String"> </parameter> -<parameter name="parameterTypes" type="java.lang.Class..."> +<parameter name="parameterTypes" type="java.lang.Class<?>..."> </parameter> <exception name="NoSuchMethodException" type="java.lang.NoSuchMethodException"> </exception> @@ -244441,7 +243410,7 @@ > <parameter name="componentType" type="java.lang.Class<?>"> </parameter> -<parameter name="dimensions" type="int[]"> +<parameter name="dimensions" type="int..."> </parameter> <exception name="IllegalArgumentException" type="java.lang.IllegalArgumentException"> </exception> @@ -245399,7 +244368,7 @@ visibility="public" > <method name="getDeclaringClass" - return="java.lang.Class" + return="java.lang.Class<?>" abstract="true" native="false" synchronized="false" @@ -269283,7 +268252,7 @@ </constructor> </class> <class name="UnrecoverableKeyException" - extends="java.security.GeneralSecurityException" + extends="java.security.UnrecoverableEntryException" abstract="false" static="false" final="false" @@ -288555,21 +287524,6 @@ <parameter name="where" type="java.util.Locale"> </parameter> </method> -<method name="getInt" - return="int" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="protected" -> -<parameter name="buf" type="byte[]"> -</parameter> -<parameter name="offset" type="int"> -</parameter> -</method> <method name="getLineInstance" return="java.text.BreakIterator" abstract="false" @@ -288594,21 +287548,6 @@ <parameter name="where" type="java.util.Locale"> </parameter> </method> -<method name="getLong" - return="long" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="protected" -> -<parameter name="buf" type="byte[]"> -</parameter> -<parameter name="offset" type="int"> -</parameter> -</method> <method name="getSentenceInstance" return="java.text.BreakIterator" abstract="false" @@ -288633,21 +287572,6 @@ <parameter name="where" type="java.util.Locale"> </parameter> </method> -<method name="getShort" - return="short" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="protected" -> -<parameter name="buf" type="byte[]"> -</parameter> -<parameter name="offset" type="int"> -</parameter> -</method> <method name="getText" return="java.text.CharacterIterator" abstract="true" @@ -289265,9 +288189,9 @@ </class> <class name="CollationKey" extends="java.lang.Object" - abstract="false" + abstract="true" static="false" - final="true" + final="false" deprecated="not deprecated" visibility="public" > @@ -289275,7 +288199,7 @@ </implements> <method name="compareTo" return="int" - abstract="false" + abstract="true" native="false" synchronized="false" static="false" @@ -289299,7 +288223,7 @@ </method> <method name="toByteArray" return="byte[]" - abstract="false" + abstract="true" native="false" synchronized="false" static="false" @@ -291023,7 +289947,7 @@ extends="java.lang.Object" abstract="false" static="false" - final="true" + final="false" deprecated="not deprecated" visibility="public" > @@ -291525,7 +290449,7 @@ static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > </constructor> <method name="clone" @@ -291925,7 +290849,7 @@ static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > </constructor> <method name="format" @@ -304846,8 +303770,6 @@ </implements> <implements name="java.io.Serializable"> </implements> -<implements name="java.util.SortedSet"> -</implements> <constructor name="TreeSet" type="java.util.TreeSet" static="false" @@ -305639,7 +304561,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <exception name="InterruptedException" type="java.lang.InterruptedException"> </exception> @@ -305654,7 +304576,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <parameter name="timeout" type="long"> </parameter> @@ -305673,7 +304595,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <exception name="ExecutionException" type="java.util.concurrent.ExecutionException"> </exception> @@ -305690,7 +304612,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <parameter name="timeout" type="long"> </parameter> @@ -307703,7 +306625,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <exception name="InterruptedException" type="java.lang.InterruptedException"> </exception> @@ -307718,7 +306640,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <parameter name="timeout" type="long"> </parameter> @@ -307737,7 +306659,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <exception name="ExecutionException" type="java.util.concurrent.ExecutionException"> </exception> @@ -307754,7 +306676,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="tasks" type="java.util.Collection<java.util.concurrent.Callable<T>>"> +<parameter name="tasks" type="java.util.Collection<? extends java.util.concurrent.Callable<T>>"> </parameter> <parameter name="timeout" type="long"> </parameter> @@ -307899,7 +306821,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="action" type="java.security.PrivilegedAction"> +<parameter name="action" type="java.security.PrivilegedAction<?>"> </parameter> </method> <method name="callable" @@ -307912,7 +306834,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="action" type="java.security.PrivilegedExceptionAction"> +<parameter name="action" type="java.security.PrivilegedExceptionAction<?>"> </parameter> </method> <method name="defaultThreadFactory" @@ -308205,10 +307127,6 @@ deprecated="not deprecated" visibility="public" > -<implements name="java.util.concurrent.Future"> -</implements> -<implements name="java.lang.Runnable"> -</implements> <constructor name="FutureTask" type="java.util.concurrent.FutureTask" static="false" @@ -312237,7 +311155,7 @@ static="false" final="false" deprecated="not deprecated" - visibility="" + visibility="public" > <implements name="java.io.Serializable"> </implements> @@ -337423,11 +336341,11 @@ deprecated="not deprecated" visibility="public" > -<parameter name="parameters" type="java.util.List"> +<parameter name="parameters" type="java.util.List<java.security.KeyStore.Builder>"> </parameter> </constructor> <method name="getParameters" - return="java.util.List" + return="java.util.List<java.security.KeyStore.Builder>" abstract="false" native="false" synchronized="false" @@ -339058,7 +337976,7 @@ visibility="public" > <method name="getIds" - return="java.util.Enumeration" + return="java.util.Enumeration<byte[]>" abstract="true" native="false" synchronized="false" @@ -340147,7 +339065,7 @@ </parameter> </constructor> <method name="doAs" - return="java.lang.Object" + return="T" abstract="false" native="false" synchronized="false" @@ -340158,11 +339076,11 @@ > <parameter name="subject" type="javax.security.auth.Subject"> </parameter> -<parameter name="action" type="java.security.PrivilegedAction"> +<parameter name="action" type="java.security.PrivilegedAction<T>"> </parameter> </method> <method name="doAs" - return="java.lang.Object" + return="T" abstract="false" native="false" synchronized="false" @@ -340173,13 +339091,13 @@ > <parameter name="subject" type="javax.security.auth.Subject"> </parameter> -<parameter name="action" type="java.security.PrivilegedExceptionAction"> +<parameter name="action" type="java.security.PrivilegedExceptionAction<T>"> </parameter> <exception name="PrivilegedActionException" type="java.security.PrivilegedActionException"> </exception> </method> <method name="doAsPrivileged" - return="java.lang.Object" + return="T" abstract="false" native="false" synchronized="false" @@ -340190,13 +339108,13 @@ > <parameter name="subject" type="javax.security.auth.Subject"> </parameter> -<parameter name="action" type="java.security.PrivilegedAction"> +<parameter name="action" type="java.security.PrivilegedAction<T>"> </parameter> <parameter name="context" type="java.security.AccessControlContext"> </parameter> </method> <method name="doAsPrivileged" - return="java.lang.Object" + return="T" abstract="false" native="false" synchronized="false" @@ -340207,7 +339125,7 @@ > <parameter name="subject" type="javax.security.auth.Subject"> </parameter> -<parameter name="action" type="java.security.PrivilegedExceptionAction"> +<parameter name="action" type="java.security.PrivilegedExceptionAction<T>"> </parameter> <parameter name="context" type="java.security.AccessControlContext"> </parameter> @@ -341179,32 +340097,6 @@ deprecated="not deprecated" visibility="public" > -<method name="getLogWriter" - return="java.io.PrintWriter" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> -<method name="getLoginTimeout" - return="int" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> <method name="getPooledConnection" return="javax.sql.PooledConnection" abstract="true" @@ -341235,36 +340127,6 @@ <exception name="SQLException" type="java.sql.SQLException"> </exception> </method> -<method name="setLogWriter" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="theWriter" type="java.io.PrintWriter"> -</parameter> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> -<method name="setLoginTimeout" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="theTimeout" type="int"> -</parameter> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> </interface> <interface name="DataSource" abstract="true" @@ -341303,62 +340165,6 @@ <exception name="SQLException" type="java.sql.SQLException"> </exception> </method> -<method name="getLogWriter" - return="java.io.PrintWriter" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> -<method name="getLoginTimeout" - return="int" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> -<method name="setLogWriter" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="theWriter" type="java.io.PrintWriter"> -</parameter> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> -<method name="setLoginTimeout" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="theTimeout" type="int"> -</parameter> -<exception name="SQLException" type="java.sql.SQLException"> -</exception> -</method> </interface> <interface name="PooledConnection" abstract="true" |