am 2eb13d3f: am 245df5ad: am 3f264c4f: Merge "API CHANGE: rename... (de0d50f8) · Commits · e / os / android_frameworks_base

api/current.xml

+70 −70

Original line number	Diff line number	Diff line
		@@ -27075,6 +27075,76 @@
		</exception>
		</method>
		</class>
		<class name="BackupAgentHelper"
		extends="android.app.backup.BackupAgent"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="BackupAgentHelper"
		type="android.app.backup.BackupAgentHelper"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</constructor>
		<method name="addHelper"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="keyPrefix" type="java.lang.String">
		</parameter>
		<parameter name="helper" type="android.app.backup.BackupHelper">
		</parameter>
		</method>
		<method name="onBackup"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="oldState" type="android.os.ParcelFileDescriptor">
		</parameter>
		<parameter name="data" type="android.app.backup.BackupDataOutput">
		</parameter>
		<parameter name="newState" type="android.os.ParcelFileDescriptor">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="onRestore"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="data" type="android.app.backup.BackupDataInput">
		</parameter>
		<parameter name="appVersionCode" type="int">
		</parameter>
		<parameter name="newState" type="android.os.ParcelFileDescriptor">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		</class>
		<class name="BackupDataInput"
		extends="java.lang.Object"
		abstract="false"
		@@ -27324,76 +27394,6 @@
		</parameter>
		</method>
		</interface>
		<class name="BackupHelperAgent"
		extends="android.app.backup.BackupAgent"
		abstract="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<constructor name="BackupHelperAgent"
		type="android.app.backup.BackupHelperAgent"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		</constructor>
		<method name="addHelper"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="keyPrefix" type="java.lang.String">
		</parameter>
		<parameter name="helper" type="android.app.backup.BackupHelper">
		</parameter>
		</method>
		<method name="onBackup"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="oldState" type="android.os.ParcelFileDescriptor">
		</parameter>
		<parameter name="data" type="android.app.backup.BackupDataOutput">
		</parameter>
		<parameter name="newState" type="android.os.ParcelFileDescriptor">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		<method name="onRestore"
		return="void"
		abstract="false"
		native="false"
		synchronized="false"
		static="false"
		final="false"
		deprecated="not deprecated"
		visibility="public"
		>
		<parameter name="data" type="android.app.backup.BackupDataInput">
		</parameter>
		<parameter name="appVersionCode" type="int">
		</parameter>
		<parameter name="newState" type="android.os.ParcelFileDescriptor">
		</parameter>
		<exception name="IOException" type="java.io.IOException">
		</exception>
		</method>
		</class>
		<class name="BackupManager"
		extends="java.lang.Object"
		abstract="false"

core/java/android/app/backup/BackupAgent.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ import java.io.IOException;
		* respectively.
		* <p>
		* A backup agent based on convenient helper classes is available in
		* {@link android.app.backup.BackupHelperAgent} for less complex implementation
		* {@link android.app.backup.BackupAgentHelper} for less complex implementation
		* requirements.
		* <p>
		* STOPSHIP write more documentation about the backup process here.

core/java/android/app/backup/BackupHelperAgent.java→core/java/android/app/backup/BackupAgentHelper.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -27,12 +27,12 @@ import java.io.IOException;
		* backup agent. Then, within the agent's onBackup() and onRestore() methods, it
		* will call {@link #addHelper(String, BackupHelper)} one or more times to
		* specify the data sets, then invoke super.onBackup() or super.onRestore() to
		* have the BackupHelperAgent implementation process the data.
		* have the BackupAgentHelper implementation process the data.
		* <p>
		* STOPSHIP: document!
		*/
		public class BackupHelperAgent extends BackupAgent {
		static final String TAG = "BackupHelperAgent";
		public class BackupAgentHelper extends BackupAgent {
		static final String TAG = "BackupAgentHelper";

		BackupHelperDispatcher mDispatcher = new BackupHelperDispatcher();

core/java/android/app/backup/BackupHelper.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ import android.os.ParcelFileDescriptor;

		/**
		* A convenient interface to be used with the
		* {@link android.app.backup.BackupHelperAgent} to implement backup and restore of
		* {@link android.app.backup.BackupAgentHelper} to implement backup and restore of
		* arbitrary data types.
		* <p>
		* STOPSHOP: document!
		@@ -36,7 +36,8 @@ public interface BackupHelper {
		ParcelFileDescriptor newState);

		/**
		* Called by BackupHelperAgent to restore one entity from the restore dataset.
		* Called by {@link android.app.backup.BackupAgentHelper BackupAgentHelper}
		* to restore one entity from the restore dataset.
		* <p class=note>
		* Do not close the <code>data</code> stream. Do not read more than
		* <code>data.size()</code> bytes from <code>data</code>.
		@@ -44,7 +45,8 @@ public interface BackupHelper {
		public void restoreEntity(BackupDataInputStream data);

		/**
		* Called by BackupHelperAgent to write the new backup state file corresponding to
		* Called by {@link android.app.backup.BackupAgentHelper BackupAgentHelper}
		* to write the new backup state file corresponding to
		* the current state of the app's data at the time the backup operation was
		* performed.
		*/

core/java/android/app/backup/BackupManager.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ import android.util.Log;
		* of how the backup then proceeds.
		* <p>
		* A simple implementation of a BackupAgent useful for backing up Preferences
		* and files is available by using {@link android.app.backup.BackupHelperAgent}.
		* and files is available by using {@link android.app.backup.BackupAgentHelper}.
		* <p>
		* STOPSHIP: more documentation!
		* <p>