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

am 3326f804: Fix the last remaining gaps in our Java 6 API.

Browse Source 
Merge commit '3326f8043858152ea2a407a9a4c20fdcdc859e73' into gingerbread-plus-aosp

* commit '3326f8043858152ea2a407a9a4c20fdcdc859e73':
  Fix the last remaining gaps in our Java 6 API.
This commit is contained in:
Jesse Wilson
2010-09-03 16:42:51 -07:00
committed by Android Git Automerger
parent ef9e508c2c 3326f80438
commit 783f14ddc9
1 changed files with 179 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

226
api/current.xml
View File

@@ -265314,21 +265314,6 @@
visibility="protected"
>
</method>
<method name="getOption"
return="java.lang.Object"
abstract="true"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="optID" type="int">
</parameter>
<exception name="SocketException" type="java.net.SocketException">
</exception>
</method>
<method name="getOutputStream"
return="java.io.OutputStream"
abstract="true"
@@ -265383,23 +265368,6 @@
<exception name="IOException" type="java.io.IOException">
</exception>
</method>
<method name="setOption"
return="void"
abstract="true"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="optID" type="int">
</parameter>
<parameter name="val" type="java.lang.Object">
</parameter>
<exception name="SocketException" type="java.net.SocketException">
</exception>
</method>
<method name="setPerformancePreferences"
return="void"
abstract="false"
@@ -265778,19 +265746,6 @@
<parameter name="p" type="java.security.Permission">
</parameter>
</method>
<method name="isValidIP6Address"
return="boolean"
abstract="false"
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="ipAddress" type="java.lang.String">
</parameter>
</method>
</class>
<class name="SocketTimeoutException"
extends="java.io.InterruptedIOException"
@@ -279525,9 +279480,77 @@
visibility="public"
>
</constructor>
<method name="getInstance"
return="java.security.Policy"
abstract="false"
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="type" type="java.lang.String">
</parameter>
<parameter name="params" type="java.security.Policy.Parameters">
</parameter>
<exception name="NoSuchAlgorithmException" type="java.security.NoSuchAlgorithmException">
</exception>
</method>
<method name="getInstance"
return="java.security.Policy"
abstract="false"
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="type" type="java.lang.String">
</parameter>
<parameter name="params" type="java.security.Policy.Parameters">
</parameter>
<parameter name="provider" type="java.lang.String">
</parameter>
<exception name="NoSuchAlgorithmException" type="java.security.NoSuchAlgorithmException">
</exception>
<exception name="NoSuchProviderException" type="java.security.NoSuchProviderException">
</exception>
</method>
<method name="getInstance"
return="java.security.Policy"
abstract="false"
native="false"
synchronized="false"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="type" type="java.lang.String">
</parameter>
<parameter name="params" type="java.security.Policy.Parameters">
</parameter>
<parameter name="provider" type="java.security.Provider">
</parameter>
<exception name="NoSuchAlgorithmException" type="java.security.NoSuchAlgorithmException">
</exception>
</method>
<method name="getParameters"
return="java.security.Policy.Parameters"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getPermissions"
return="java.security.PermissionCollection"
abstract="true"
abstract="false"
native="false"
synchronized="false"
static="false"
@@ -279562,6 +279585,28 @@
visibility="public"
>
</method>
<method name="getProvider"
return="java.security.Provider"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="getType"
return="java.lang.String"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</method>
<method name="implies"
return="boolean"
abstract="false"
@@ -279579,7 +279624,7 @@
</method>
<method name="refresh"
return="void"
abstract="true"
abstract="false"
native="false"
synchronized="false"
static="false"
@@ -279601,6 +279646,93 @@
<parameter name="policy" type="java.security.Policy">
</parameter>
</method>
<field name="UNSUPPORTED_EMPTY_COLLECTION"
type="java.security.PermissionCollection"
transient="false"
volatile="false"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class>
<interface name="Policy.Parameters"
abstract="true"
static="true"
final="false"
deprecated="not deprecated"
visibility="public"
>
</interface>
<class name="PolicySpi"
extends="java.lang.Object"
abstract="true"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<constructor name="PolicySpi"
type="java.security.PolicySpi"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
</constructor>
<method name="engineGetPermissions"
return="java.security.PermissionCollection"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="protected"
>
<parameter name="codesource" type="java.security.CodeSource">
</parameter>
</method>
<method name="engineGetPermissions"
return="java.security.PermissionCollection"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="protected"
>
<parameter name="domain" type="java.security.ProtectionDomain">
</parameter>
</method>
<method name="engineImplies"
return="boolean"
abstract="true"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="protected"
>
<parameter name="domain" type="java.security.ProtectionDomain">
</parameter>
<parameter name="permission" type="java.security.Permission">
</parameter>
</method>
<method name="engineRefresh"
return="void"
abstract="false"
native="false"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="protected"
>
</method>
</class>
<interface name="Principal"
abstract="true"