manual merge of 1e09a72 (ac1514c5) · Commits · e / os / android_frameworks_base

api/current.xml

+40 −5

Original line number	Diff line number	Diff line
		@@ -23851,7 +23851,7 @@
		<method name="flush"
		return="void"
		abstract="false"
		native="false"
		native="true"
		synchronized="false"
		static="false"
		final="false"
		@@ -23862,7 +23862,7 @@
		<method name="write"
		return="void"
		abstract="false"
		native="false"
		native="true"
		synchronized="false"
		static="false"
		final="false"
		@@ -23875,7 +23875,7 @@
		<method name="write"
		return="void"
		abstract="false"
		native="false"
		native="true"
		synchronized="false"
		static="false"
		final="false"
		@@ -23888,7 +23888,7 @@
		<method name="write"
		return="void"
		abstract="false"
		native="false"
		native="true"
		synchronized="false"
		static="false"
		final="false"
		@@ -23905,7 +23905,7 @@
		<method name="writeKey"
		return="void"
		abstract="false"
		native="false"
		native="true"
		synchronized="false"
		static="false"
		final="false"
		@@ -23915,6 +23915,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"