summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-05-07 18:56:43 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-05-07 18:56:43 -0700
commit1e09a72a75f5e6236acffe84f2758dd042b1c8c0 (patch)
tree951dc9e9cf37a2b86d731ac9e5d7318442553b50
parent60f3eb54a01d30882dfab5e66318d8fdd9aab1dd (diff)
parentb8908892674c188c8877fc97a2bd91c552f97cf2 (diff)
downloadframeworks_base-1e09a72a75f5e6236acffe84f2758dd042b1c8c0.zip
frameworks_base-1e09a72a75f5e6236acffe84f2758dd042b1c8c0.tar.gz
frameworks_base-1e09a72a75f5e6236acffe84f2758dd042b1c8c0.tar.bz2
Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
-rw-r--r--api/current.xml45
1 files changed, 40 insertions, 5 deletions
diff --git a/api/current.xml b/api/current.xml
index 39e9b4d..ec84c0d 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -21831,7 +21831,7 @@
<method name="flush"
return="void"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="false"
final="false"
@@ -21842,7 +21842,7 @@
<method name="write"
return="void"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="false"
final="false"
@@ -21855,7 +21855,7 @@
<method name="write"
return="void"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="false"
final="false"
@@ -21868,7 +21868,7 @@
<method name="write"
return="void"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="false"
final="false"
@@ -21885,7 +21885,7 @@
<method name="writeKey"
return="void"
abstract="false"
- native="false"
+ native="true"
synchronized="false"
static="false"
final="false"
@@ -21895,6 +21895,41 @@
<parameter name="key" type="java.lang.String">
</parameter>
</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 name="FileBackupHelper"
extends="java.lang.Object"