Merge branch 'donut' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into donut
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user