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

Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut

Browse Source
This commit is contained in:
The Android Open Source Project
2009-05-07 18:56:43 -07:00
parent 60f3eb54a0 b890889267
commit 1e09a72a75
1 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
api/current.xml
View File

@@ -21831,7 +21831,7 @@
<method name="flush" <method name="flush"
return="void" return="void"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="false" static="false"
final="false" final="false"
@@ -21842,7 +21842,7 @@
<method name="write" <method name="write"
return="void" return="void"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="false" static="false"
final="false" final="false"
@@ -21855,7 +21855,7 @@
<method name="write" <method name="write"
return="void" return="void"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="false" static="false"
final="false" final="false"
@@ -21868,7 +21868,7 @@
<method name="write" <method name="write"
return="void" return="void"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="false" static="false"
final="false" final="false"
@@ -21885,7 +21885,7 @@
<method name="writeKey" <method name="writeKey"
return="void" return="void"
abstract="false" abstract="false"
native="false" native="true"
synchronized="false" synchronized="false"
static="false" static="false"
final="false" final="false"
@@ -21895,6 +21895,41 @@
<parameter name="key" type="java.lang.String"> <parameter name="key" type="java.lang.String">
</parameter> </parameter>
</method> </method>
<method name="writeOperation"
return="void"
abstract="false"
native="true"
synchronized="false"
static="false"
final="false"
deprecated="not deprecated"
visibility="public"
>
<parameter name="op" type="int">
</parameter>
</method>
<field name="OP_DELETE"
type="int"
transient="false"
volatile="false"
value="2"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="OP_UPDATE"
type="int"
transient="false"
volatile="false"
value="1"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
</class> </class>
<class name="FileBackupHelper" <class name="FileBackupHelper"
extends="java.lang.Object" extends="java.lang.Object"