diff options
| author | Christopher Tate <ctate@google.com> | 2010-03-05 15:46:30 -0800 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2010-03-05 16:27:15 -0800 |
| commit | 4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3 (patch) | |
| tree | 3f1276aef1448aad75a0d44ad1abbbd1478a4937 | |
| parent | 931bf89d327ecf07301231fd86b17deac535feaa (diff) | |
| download | frameworks_base-4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3.zip frameworks_base-4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3.tar.gz frameworks_base-4528186e0d65fc68ef0dd1941aa2ac8aefcd55a3.tar.bz2 | |
Refactor android.backup => android.app.backup
Change-Id: I0b21316ff890d7f3c7d4b82837bb60670724c2e8
44 files changed, 781 insertions, 777 deletions
@@ -93,9 +93,9 @@ LOCAL_SRC_FILES += \ core/java/android/app/IWallpaperManager.aidl \ core/java/android/app/IWallpaperManagerCallback.aidl \ core/java/android/app/admin/IDevicePolicyManager.aidl \ - core/java/android/backup/IBackupManager.aidl \ - core/java/android/backup/IRestoreObserver.aidl \ - core/java/android/backup/IRestoreSession.aidl \ + core/java/android/app/backup/IBackupManager.aidl \ + core/java/android/app/backup/IRestoreObserver.aidl \ + core/java/android/app/backup/IRestoreSession.aidl \ core/java/android/bluetooth/IBluetooth.aidl \ core/java/android/bluetooth/IBluetoothA2dp.aidl \ core/java/android/bluetooth/IBluetoothCallback.aidl \ diff --git a/api/current.xml b/api/current.xml index fd8a180..0484b77 100644 --- a/api/current.xml +++ b/api/current.xml @@ -19916,83 +19916,6 @@ > </method> </class> -<class name="BackupAgent" - extends="android.content.ContextWrapper" - abstract="true" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<constructor name="BackupAgent" - type="android.app.BackupAgent" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</constructor> -<method name="onBackup" - return="void" - abstract="true" - 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.backup.BackupDataOutput"> -</parameter> -<parameter name="newState" type="android.os.ParcelFileDescriptor"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="onCreate" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="onDestroy" - return="void" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -</method> -<method name="onRestore" - return="void" - abstract="true" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="data" type="android.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="DatePickerDialog" extends="android.app.AlertDialog" abstract="false" @@ -26974,18 +26897,20 @@ </field> </class> </package> -<package name="android.appwidget" +<package name="android.app.backup" > -<class name="AppWidgetHost" - extends="java.lang.Object" +<class name="AbsoluteFileBackupHelper" + extends="android.app.backup.FileBackupHelperBase" abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<constructor name="AppWidgetHost" - type="android.appwidget.AppWidgetHost" +<implements name="android.app.backup.BackupHelper"> +</implements> +<constructor name="AbsoluteFileBackupHelper" + type="android.app.backup.AbsoluteFileBackupHelper" static="false" final="false" deprecated="not deprecated" @@ -26993,11 +26918,11 @@ > <parameter name="context" type="android.content.Context"> </parameter> -<parameter name="hostId" type="int"> +<parameter name="files" type="java.lang.String..."> </parameter> </constructor> -<method name="allocateAppWidgetId" - return="int" +<method name="performBackup" + return="void" abstract="false" native="false" synchronized="false" @@ -27006,77 +26931,63 @@ deprecated="not deprecated" visibility="public" > -</method> -<method name="createView" - return="android.appwidget.AppWidgetHostView" - abstract="false" - native="false" - synchronized="false" - static="false" - final="true" - deprecated="not deprecated" - visibility="public" -> -<parameter name="context" type="android.content.Context"> +<parameter name="oldState" type="android.os.ParcelFileDescriptor"> </parameter> -<parameter name="appWidgetId" type="int"> +<parameter name="data" type="android.app.backup.BackupDataOutput"> </parameter> -<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +<parameter name="newState" type="android.os.ParcelFileDescriptor"> </parameter> </method> -<method name="deleteAllHosts" +<method name="restoreEntity" return="void" abstract="false" native="false" synchronized="false" - static="true" + static="false" final="false" deprecated="not deprecated" visibility="public" > +<parameter name="data" type="android.app.backup.BackupDataInputStream"> +</parameter> </method> -<method name="deleteAppWidgetId" - return="void" - abstract="false" - native="false" - synchronized="false" +</class> +<class name="BackupAgent" + extends="android.content.ContextWrapper" + abstract="true" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="appWidgetId" type="int"> -</parameter> -</method> -<method name="deleteHost" - return="void" - abstract="false" - native="false" - synchronized="false" +<constructor name="BackupAgent" + type="android.app.backup.BackupAgent" static="false" final="false" deprecated="not deprecated" visibility="public" > -</method> -<method name="onCreateView" - return="android.appwidget.AppWidgetHostView" - abstract="false" +</constructor> +<method name="onBackup" + return="void" + abstract="true" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="protected" + visibility="public" > -<parameter name="context" type="android.content.Context"> +<parameter name="oldState" type="android.os.ParcelFileDescriptor"> </parameter> -<parameter name="appWidgetId" type="int"> +<parameter name="data" type="android.app.backup.BackupDataOutput"> </parameter> -<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +<parameter name="newState" type="android.os.ParcelFileDescriptor"> </parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> -<method name="onProviderChanged" +<method name="onCreate" return="void" abstract="false" native="false" @@ -27084,14 +26995,10 @@ static="false" final="false" deprecated="not deprecated" - visibility="protected" + visibility="public" > -<parameter name="appWidgetId" type="int"> -</parameter> -<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> -</parameter> </method> -<method name="startListening" +<method name="onDestroy" return="void" abstract="false" native="false" @@ -27102,9 +27009,9 @@ visibility="public" > </method> -<method name="stopListening" +<method name="onRestore" return="void" - abstract="false" + abstract="true" native="false" synchronized="false" static="false" @@ -27112,41 +27019,25 @@ 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="AppWidgetHostView" - extends="android.widget.FrameLayout" +<class name="BackupDataInput" + extends="java.lang.Object" abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<constructor name="AppWidgetHostView" - type="android.appwidget.AppWidgetHostView" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="context" type="android.content.Context"> -</parameter> -</constructor> -<constructor name="AppWidgetHostView" - type="android.appwidget.AppWidgetHostView" - static="false" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="context" type="android.content.Context"> -</parameter> -<parameter name="animationIn" type="int"> -</parameter> -<parameter name="animationOut" type="int"> -</parameter> -</constructor> -<method name="getAppWidgetId" +<method name="getDataSize" return="int" abstract="false" native="false" @@ -27157,8 +27048,8 @@ visibility="public" > </method> -<method name="getAppWidgetInfo" - return="android.appwidget.AppWidgetProviderInfo" +<method name="getKey" + return="java.lang.String" abstract="false" native="false" synchronized="false" @@ -27168,43 +27059,27 @@ visibility="public" > </method> -<method name="getDefaultView" - return="android.view.View" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="protected" -> -</method> -<method name="getErrorView" - return="android.view.View" - abstract="false" - native="false" - synchronized="false" - static="false" - final="false" - deprecated="not deprecated" - visibility="protected" -> -</method> -<method name="prepareView" - return="void" +<method name="readEntityData" + return="int" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="protected" + visibility="public" > -<parameter name="view" type="android.view.View"> +<parameter name="data" type="byte[]"> </parameter> +<parameter name="offset" type="int"> +</parameter> +<parameter name="size" type="int"> +</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> -<method name="setAppWidget" - return="void" +<method name="readNextHeader" + return="boolean" abstract="false" native="false" synchronized="false" @@ -27213,12 +27088,10 @@ deprecated="not deprecated" visibility="public" > -<parameter name="appWidgetId" type="int"> -</parameter> -<parameter name="info" type="android.appwidget.AppWidgetProviderInfo"> -</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> -<method name="updateAppWidget" +<method name="skipEntityData" return="void" abstract="false" native="false" @@ -27228,20 +27101,20 @@ deprecated="not deprecated" visibility="public" > -<parameter name="remoteViews" type="android.widget.RemoteViews"> -</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> </class> -<class name="AppWidgetManager" - extends="java.lang.Object" +<class name="BackupDataInputStream" + extends="java.io.InputStream" abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<method name="bindAppWidgetId" - return="void" +<method name="getKey" + return="java.lang.String" abstract="false" native="false" synchronized="false" @@ -27250,13 +27123,9 @@ deprecated="not deprecated" visibility="public" > -<parameter name="appWidgetId" type="int"> -</parameter> -<parameter name="provider" type="android.content.ComponentName"> -</parameter> </method> -<method name="getAppWidgetIds" - return="int[]" +<method name="read" + return="int" abstract="false" native="false" synchronized="false" @@ -27265,11 +27134,11 @@ deprecated="not deprecated" visibility="public" > -<parameter name="provider" type="android.content.ComponentName"> -</parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> -<method name="getAppWidgetInfo" - return="android.appwidget.AppWidgetProviderInfo" +<method name="size" + return="int" abstract="false" native="false" synchronized="false" @@ -27278,34 +27147,17 @@ deprecated="not deprecated" visibility="public" > -<parameter name="appWidgetId" type="int"> -</parameter> </method> -<method name="getInstalledProviders" - return="java.util.List<android.appwidget.AppWidgetProviderInfo>" +</class> +<class name="BackupDataOutput" + extends="java.lang.Object" abstract="false" - native="false" - synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</method> -<method name="getInstance" - return="android.appwidget.AppWidgetManager" - abstract="false" - native="false" - synchronized="false" - static="true" - final="false" - deprecated="not deprecated" - visibility="public" -> -<parameter name="context" type="android.content.Context"> -</parameter> -</method> -<method name="updateAppWidget" +<method name="setKeyPrefix" return="void" abstract="false" native="false" @@ -27315,13 +27167,11 @@ deprecated="not deprecated" visibility="public" > -<parameter name="appWidgetIds" type="int[]"> -</parameter> -<parameter name="views" type="android.widget.RemoteViews"> +<parameter name="keyPrefix" type="java.lang.String"> </parameter> </method> -<method name="updateAppWidget" - return="void" +<method name="writeEntityData" + return="int" abstract="false" native="false" synchronized="false" @@ -27330,13 +27180,15 @@ deprecated="not deprecated" visibility="public" > -<parameter name="appWidgetId" type="int"> +<parameter name="data" type="byte[]"> </parameter> -<parameter name="views" type="android.widget.RemoteViews"> +<parameter name="size" type="int"> </parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> -<method name="updateAppWidget" - return="void" +<method name="writeEntityHeader" + return="int" abstract="false" native="false" synchronized="false" @@ -27345,137 +27197,29 @@ deprecated="not deprecated" visibility="public" > -<parameter name="provider" type="android.content.ComponentName"> +<parameter name="key" type="java.lang.String"> </parameter> -<parameter name="views" type="android.widget.RemoteViews"> +<parameter name="dataSize" type="int"> </parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> -<field name="ACTION_APPWIDGET_CONFIGURE" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.appwidget.action.APPWIDGET_CONFIGURE"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="ACTION_APPWIDGET_DELETED" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.appwidget.action.APPWIDGET_DELETED"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="ACTION_APPWIDGET_DISABLED" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.appwidget.action.APPWIDGET_DISABLED"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="ACTION_APPWIDGET_ENABLED" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.appwidget.action.APPWIDGET_ENABLED"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="ACTION_APPWIDGET_PICK" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.appwidget.action.APPWIDGET_PICK"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="ACTION_APPWIDGET_UPDATE" - type="java.lang.String" - transient="false" - volatile="false" - value=""android.appwidget.action.APPWIDGET_UPDATE"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="EXTRA_APPWIDGET_ID" - type="java.lang.String" - transient="false" - volatile="false" - value=""appWidgetId"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="EXTRA_APPWIDGET_IDS" - type="java.lang.String" - transient="false" - volatile="false" - value=""appWidgetIds"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="EXTRA_CUSTOM_EXTRAS" - type="java.lang.String" - transient="false" - volatile="false" - value=""customExtras"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="EXTRA_CUSTOM_INFO" - type="java.lang.String" - transient="false" - volatile="false" - value=""customInfo"" - static="true" - final="true" - deprecated="not deprecated" - visibility="public" -> -</field> -<field name="INVALID_APPWIDGET_ID" +<field name="OP_DELETE" type="int" transient="false" volatile="false" - value="0" + value="2" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="META_DATA_APPWIDGET_PROVIDER" - type="java.lang.String" +<field name="OP_UPDATE" + type="int" transient="false" volatile="false" - value=""android.appwidget.provider"" + value="1" static="true" final="true" deprecated="not deprecated" @@ -27483,25 +27227,33 @@ > </field> </class> -<class name="AppWidgetProvider" - extends="android.content.BroadcastReceiver" - abstract="false" +<interface name="BackupHelper" + abstract="true" static="false" final="false" deprecated="not deprecated" visibility="public" > -<constructor name="AppWidgetProvider" - type="android.appwidget.AppWidgetProvider" +<method name="performBackup" + return="void" + abstract="true" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</constructor> -<method name="onDeleted" +<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> +</method> +<method name="restoreEntity" return="void" - abstract="false" + abstract="true" native="false" synchronized="false" static="false" @@ -27509,14 +27261,12 @@ deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> -</parameter> -<parameter name="appWidgetIds" type="int[]"> +<parameter name="data" type="android.app.backup.BackupDataInputStream"> </parameter> </method> -<method name="onDisabled" +<method name="writeNewStateDescription" return="void" - abstract="false" + abstract="true" native="false" synchronized="false" static="false" @@ -27524,10 +27274,27 @@ deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> +<parameter name="fd" type="android.os.ParcelFileDescriptor"> </parameter> </method> -<method name="onEnabled" +</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" @@ -27537,10 +27304,12 @@ deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> +<parameter name="keyPrefix" type="java.lang.String"> +</parameter> +<parameter name="helper" type="android.app.backup.BackupHelper"> </parameter> </method> -<method name="onReceive" +<method name="onBackup" return="void" abstract="false" native="false" @@ -27550,12 +27319,16 @@ deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> +<parameter name="oldState" type="android.os.ParcelFileDescriptor"> </parameter> -<parameter name="intent" type="android.content.Intent"> +<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="onUpdate" +<method name="onRestore" return="void" abstract="false" native="false" @@ -27565,15 +27338,17 @@ deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> +<parameter name="data" type="android.app.backup.BackupDataInput"> </parameter> -<parameter name="appWidgetManager" type="android.appwidget.AppWidgetManager"> +<parameter name="appVersionCode" type="int"> </parameter> -<parameter name="appWidgetIds" type="int[]"> +<parameter name="newState" type="android.os.ParcelFileDescriptor"> </parameter> +<exception name="IOException" type="java.io.IOException"> +</exception> </method> </class> -<class name="AppWidgetProviderInfo" +<class name="BackupManager" extends="java.lang.Object" abstract="false" static="false" @@ -27581,28 +27356,29 @@ deprecated="not deprecated" visibility="public" > -<implements name="android.os.Parcelable"> -</implements> -<constructor name="AppWidgetProviderInfo" - type="android.appwidget.AppWidgetProviderInfo" +<constructor name="BackupManager" + type="android.app.backup.BackupManager" static="false" final="false" deprecated="not deprecated" visibility="public" > +<parameter name="context" type="android.content.Context"> +</parameter> </constructor> -<constructor name="AppWidgetProviderInfo" - type="android.appwidget.AppWidgetProviderInfo" +<method name="beginRestoreSession" + return="android.app.backup.RestoreSession" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="in" type="android.os.Parcel"> -</parameter> -</constructor> -<method name="describeContents" - return="int" +</method> +<method name="dataChanged" + return="void" abstract="false" native="false" synchronized="false" @@ -27612,127 +27388,159 @@ visibility="public" > </method> -<method name="writeToParcel" +<method name="dataChanged" return="void" abstract="false" native="false" synchronized="false" - static="false" + static="true" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="out" type="android.os.Parcel"> -</parameter> -<parameter name="flags" type="int"> +<parameter name="packageName" type="java.lang.String"> </parameter> </method> -<field name="CREATOR" - type="android.os.Parcelable.Creator" - transient="false" - volatile="false" - static="true" - final="true" +</class> +<class name="FileBackupHelper" + extends="android.app.backup.FileBackupHelperBase" + abstract="false" + static="false" + final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="configure" - type="android.content.ComponentName" - transient="false" - volatile="false" +<implements name="android.app.backup.BackupHelper"> +</implements> +<constructor name="FileBackupHelper" + type="android.app.backup.FileBackupHelper" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="icon" - type="int" - transient="false" - volatile="false" +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="files" type="java.lang.String..."> +</parameter> +</constructor> +<method name="performBackup" + return="void" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="initialLayout" - type="int" - transient="false" - volatile="false" +<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> +</method> +<method name="restoreEntity" + return="void" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="label" - type="java.lang.String" - transient="false" - volatile="false" +<parameter name="data" type="android.app.backup.BackupDataInputStream"> +</parameter> +</method> +</class> +<class name="FileBackupHelperBase" + extends="java.lang.Object" + abstract="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="" +> +<method name="writeNewStateDescription" + return="void" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="minHeight" - type="int" - transient="false" - volatile="false" +<parameter name="fd" type="android.os.ParcelFileDescriptor"> +</parameter> +</method> +</class> +<class name="RestoreObserver" + extends="java.lang.Object" + abstract="true" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="minWidth" - type="int" - transient="false" - volatile="false" +<constructor name="RestoreObserver" + type="android.app.backup.RestoreObserver" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="provider" - type="android.content.ComponentName" - transient="false" - volatile="false" +</constructor> +</class> +<class name="RestoreSession" + extends="java.lang.Object" + abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -<field name="updatePeriodMillis" - type="int" - transient="false" - volatile="false" +<method name="endRestoreSession" + return="void" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</field> -</class> -</package> -<package name="android.backup" +</method> +<method name="restorePackage" + return="int" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" > -<class name="AbsoluteFileBackupHelper" - extends="android.backup.FileBackupHelperBase" +<parameter name="packageName" type="java.lang.String"> +</parameter> +<parameter name="observer" type="android.app.backup.RestoreObserver"> +</parameter> +</method> +</class> +<class name="SharedPreferencesBackupHelper" + extends="android.app.backup.FileBackupHelperBase" abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<implements name="android.backup.BackupHelper"> +<implements name="android.app.backup.BackupHelper"> </implements> -<constructor name="AbsoluteFileBackupHelper" - type="android.backup.AbsoluteFileBackupHelper" +<constructor name="SharedPreferencesBackupHelper" + type="android.app.backup.SharedPreferencesBackupHelper" static="false" final="false" deprecated="not deprecated" @@ -27740,7 +27548,7 @@ > <parameter name="context" type="android.content.Context"> </parameter> -<parameter name="files" type="java.lang.String..."> +<parameter name="prefGroups" type="java.lang.String..."> </parameter> </constructor> <method name="performBackup" @@ -27755,7 +27563,7 @@ > <parameter name="oldState" type="android.os.ParcelFileDescriptor"> </parameter> -<parameter name="data" type="android.backup.BackupDataOutput"> +<parameter name="data" type="android.app.backup.BackupDataOutput"> </parameter> <parameter name="newState" type="android.os.ParcelFileDescriptor"> </parameter> @@ -27770,11 +27578,14 @@ deprecated="not deprecated" visibility="public" > -<parameter name="data" type="android.backup.BackupDataInputStream"> +<parameter name="data" type="android.app.backup.BackupDataInputStream"> </parameter> </method> </class> -<class name="BackupDataInput" +</package> +<package name="android.appwidget" +> +<class name="AppWidgetHost" extends="java.lang.Object" abstract="false" static="false" @@ -27782,7 +27593,19 @@ deprecated="not deprecated" visibility="public" > -<method name="getDataSize" +<constructor name="AppWidgetHost" + type="android.appwidget.AppWidgetHost" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="hostId" type="int"> +</parameter> +</constructor> +<method name="allocateAppWidgetId" return="int" abstract="false" native="false" @@ -27793,38 +27616,36 @@ visibility="public" > </method> -<method name="getKey" - return="java.lang.String" +<method name="createView" + return="android.appwidget.AppWidgetHostView" abstract="false" native="false" synchronized="false" static="false" - final="false" + final="true" deprecated="not deprecated" visibility="public" > +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> </method> -<method name="readEntityData" - return="int" +<method name="deleteAllHosts" + return="void" abstract="false" native="false" synchronized="false" - static="false" + static="true" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="data" type="byte[]"> -</parameter> -<parameter name="offset" type="int"> -</parameter> -<parameter name="size" type="int"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> </method> -<method name="readNextHeader" - return="boolean" +<method name="deleteAppWidgetId" + return="void" abstract="false" native="false" synchronized="false" @@ -27833,10 +27654,10 @@ deprecated="not deprecated" visibility="public" > -<exception name="IOException" type="java.io.IOException"> -</exception> +<parameter name="appWidgetId" type="int"> +</parameter> </method> -<method name="skipEntityData" +<method name="deleteHost" return="void" abstract="false" native="false" @@ -27846,31 +27667,41 @@ deprecated="not deprecated" visibility="public" > -<exception name="IOException" type="java.io.IOException"> -</exception> </method> -</class> -<class name="BackupDataInputStream" - extends="java.io.InputStream" +<method name="onCreateView" + return="android.appwidget.AppWidgetHostView" abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > -<method name="getKey" - return="java.lang.String" +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> +</method> +<method name="onProviderChanged" + return="void" abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="appWidget" type="android.appwidget.AppWidgetProviderInfo"> +</parameter> </method> -<method name="read" - return="int" +<method name="startListening" + return="void" abstract="false" native="false" synchronized="false" @@ -27879,11 +27710,9 @@ deprecated="not deprecated" visibility="public" > -<exception name="IOException" type="java.io.IOException"> -</exception> </method> -<method name="size" - return="int" +<method name="stopListening" + return="void" abstract="false" native="false" synchronized="false" @@ -27894,45 +27723,39 @@ > </method> </class> -<class name="BackupDataOutput" - extends="java.lang.Object" +<class name="AppWidgetHostView" + extends="android.widget.FrameLayout" abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<method name="setKeyPrefix" - return="void" - abstract="false" - native="false" - synchronized="false" +<constructor name="AppWidgetHostView" + type="android.appwidget.AppWidgetHostView" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="keyPrefix" type="java.lang.String"> +<parameter name="context" type="android.content.Context"> </parameter> -</method> -<method name="writeEntityData" - return="int" - abstract="false" - native="false" - synchronized="false" +</constructor> +<constructor name="AppWidgetHostView" + type="android.appwidget.AppWidgetHostView" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="data" type="byte[]"> +<parameter name="context" type="android.content.Context"> </parameter> -<parameter name="size" type="int"> +<parameter name="animationIn" type="int"> </parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> -</method> -<method name="writeEntityHeader" +<parameter name="animationOut" type="int"> +</parameter> +</constructor> +<method name="getAppWidgetId" return="int" abstract="false" native="false" @@ -27942,76 +27765,56 @@ deprecated="not deprecated" visibility="public" > -<parameter name="key" type="java.lang.String"> -</parameter> -<parameter name="dataSize" type="int"> -</parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> </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" +<method name="getAppWidgetInfo" + return="android.appwidget.AppWidgetProviderInfo" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" deprecated="not deprecated" visibility="public" > -</field> -</class> -<interface name="BackupHelper" - abstract="true" +</method> +<method name="getDefaultView" + return="android.view.View" + abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > -<method name="performBackup" - return="void" - abstract="true" +</method> +<method name="getErrorView" + return="android.view.View" + abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > -<parameter name="oldState" type="android.os.ParcelFileDescriptor"> -</parameter> -<parameter name="data" type="android.backup.BackupDataOutput"> -</parameter> -<parameter name="newState" type="android.os.ParcelFileDescriptor"> -</parameter> </method> -<method name="restoreEntity" +<method name="prepareView" return="void" - abstract="true" + abstract="false" native="false" synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="public" + visibility="protected" > -<parameter name="data" type="android.backup.BackupDataInputStream"> +<parameter name="view" type="android.view.View"> </parameter> </method> -<method name="writeNewStateDescription" +<method name="setAppWidget" return="void" - abstract="true" + abstract="false" native="false" synchronized="false" static="false" @@ -28019,27 +27822,34 @@ deprecated="not deprecated" visibility="public" > -<parameter name="fd" type="android.os.ParcelFileDescriptor"> +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="info" type="android.appwidget.AppWidgetProviderInfo"> </parameter> </method> -</interface> -<class name="BackupHelperAgent" - extends="android.app.BackupAgent" +<method name="updateAppWidget" + return="void" abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<constructor name="BackupHelperAgent" - type="android.backup.BackupHelperAgent" +<parameter name="remoteViews" type="android.widget.RemoteViews"> +</parameter> +</method> +</class> +<class name="AppWidgetManager" + extends="java.lang.Object" + abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -</constructor> -<method name="addHelper" +<method name="bindAppWidgetId" return="void" abstract="false" native="false" @@ -28049,13 +27859,13 @@ deprecated="not deprecated" visibility="public" > -<parameter name="keyPrefix" type="java.lang.String"> +<parameter name="appWidgetId" type="int"> </parameter> -<parameter name="helper" type="android.backup.BackupHelper"> +<parameter name="provider" type="android.content.ComponentName"> </parameter> </method> -<method name="onBackup" - return="void" +<method name="getAppWidgetIds" + return="int[]" abstract="false" native="false" synchronized="false" @@ -28064,17 +27874,11 @@ deprecated="not deprecated" visibility="public" > -<parameter name="oldState" type="android.os.ParcelFileDescriptor"> -</parameter> -<parameter name="data" type="android.backup.BackupDataOutput"> -</parameter> -<parameter name="newState" type="android.os.ParcelFileDescriptor"> +<parameter name="provider" type="android.content.ComponentName"> </parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> </method> -<method name="onRestore" - return="void" +<method name="getAppWidgetInfo" + return="android.appwidget.AppWidgetProviderInfo" abstract="false" native="false" synchronized="false" @@ -28083,36 +27887,35 @@ deprecated="not deprecated" visibility="public" > -<parameter name="data" type="android.backup.BackupDataInput"> -</parameter> -<parameter name="appVersionCode" type="int"> -</parameter> -<parameter name="newState" type="android.os.ParcelFileDescriptor"> +<parameter name="appWidgetId" type="int"> </parameter> -<exception name="IOException" type="java.io.IOException"> -</exception> </method> -</class> -<class name="BackupManager" - extends="java.lang.Object" +<method name="getInstalledProviders" + return="java.util.List<android.appwidget.AppWidgetProviderInfo>" abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<constructor name="BackupManager" - type="android.backup.BackupManager" - static="false" +</method> +<method name="getInstance" + return="android.appwidget.AppWidgetManager" + abstract="false" + native="false" + synchronized="false" + static="true" final="false" deprecated="not deprecated" visibility="public" > <parameter name="context" type="android.content.Context"> </parameter> -</constructor> -<method name="beginRestoreSession" - return="android.backup.RestoreSession" +</method> +<method name="updateAppWidget" + return="void" abstract="false" native="false" synchronized="false" @@ -28121,8 +27924,12 @@ deprecated="not deprecated" visibility="public" > +<parameter name="appWidgetIds" type="int[]"> +</parameter> +<parameter name="views" type="android.widget.RemoteViews"> +</parameter> </method> -<method name="dataChanged" +<method name="updateAppWidget" return="void" abstract="false" native="false" @@ -28132,44 +27939,176 @@ deprecated="not deprecated" visibility="public" > +<parameter name="appWidgetId" type="int"> +</parameter> +<parameter name="views" type="android.widget.RemoteViews"> +</parameter> </method> -<method name="dataChanged" +<method name="updateAppWidget" return="void" abstract="false" native="false" synchronized="false" - static="true" + static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="packageName" type="java.lang.String"> +<parameter name="provider" type="android.content.ComponentName"> +</parameter> +<parameter name="views" type="android.widget.RemoteViews"> </parameter> </method> +<field name="ACTION_APPWIDGET_CONFIGURE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_CONFIGURE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_DELETED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_DELETED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_DISABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_DISABLED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_ENABLED" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_ENABLED"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_PICK" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_PICK"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="ACTION_APPWIDGET_UPDATE" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.action.APPWIDGET_UPDATE"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_APPWIDGET_ID" + type="java.lang.String" + transient="false" + volatile="false" + value=""appWidgetId"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_APPWIDGET_IDS" + type="java.lang.String" + transient="false" + volatile="false" + value=""appWidgetIds"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_CUSTOM_EXTRAS" + type="java.lang.String" + transient="false" + volatile="false" + value=""customExtras"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="EXTRA_CUSTOM_INFO" + type="java.lang.String" + transient="false" + volatile="false" + value=""customInfo"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="INVALID_APPWIDGET_ID" + type="int" + transient="false" + volatile="false" + value="0" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="META_DATA_APPWIDGET_PROVIDER" + type="java.lang.String" + transient="false" + volatile="false" + value=""android.appwidget.provider"" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> </class> -<class name="FileBackupHelper" - extends="android.backup.FileBackupHelperBase" +<class name="AppWidgetProvider" + extends="android.content.BroadcastReceiver" abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<implements name="android.backup.BackupHelper"> -</implements> -<constructor name="FileBackupHelper" - type="android.backup.FileBackupHelper" +<constructor name="AppWidgetProvider" + type="android.appwidget.AppWidgetProvider" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> -</parameter> -<parameter name="files" type="java.lang.String..."> -</parameter> </constructor> -<method name="performBackup" +<method name="onDeleted" return="void" abstract="false" native="false" @@ -28179,14 +28118,25 @@ deprecated="not deprecated" visibility="public" > -<parameter name="oldState" type="android.os.ParcelFileDescriptor"> +<parameter name="context" type="android.content.Context"> </parameter> -<parameter name="data" type="android.backup.BackupDataOutput"> +<parameter name="appWidgetIds" type="int[]"> </parameter> -<parameter name="newState" type="android.os.ParcelFileDescriptor"> +</method> +<method name="onDisabled" + return="void" + abstract="false" + native="false" + synchronized="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +<parameter name="context" type="android.content.Context"> </parameter> </method> -<method name="restoreEntity" +<method name="onEnabled" return="void" abstract="false" native="false" @@ -28196,19 +28146,25 @@ deprecated="not deprecated" visibility="public" > -<parameter name="data" type="android.backup.BackupDataInputStream"> +<parameter name="context" type="android.content.Context"> </parameter> </method> -</class> -<class name="FileBackupHelperBase" - extends="java.lang.Object" +<method name="onReceive" + return="void" abstract="false" + native="false" + synchronized="false" static="false" final="false" deprecated="not deprecated" - visibility="" + visibility="public" > -<method name="writeNewStateDescription" +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="intent" type="android.content.Intent"> +</parameter> +</method> +<method name="onUpdate" return="void" abstract="false" native="false" @@ -28218,37 +28174,44 @@ deprecated="not deprecated" visibility="public" > -<parameter name="fd" type="android.os.ParcelFileDescriptor"> +<parameter name="context" type="android.content.Context"> +</parameter> +<parameter name="appWidgetManager" type="android.appwidget.AppWidgetManager"> +</parameter> +<parameter name="appWidgetIds" type="int[]"> </parameter> </method> </class> -<class name="RestoreObserver" +<class name="AppWidgetProviderInfo" extends="java.lang.Object" - abstract="true" + abstract="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<constructor name="RestoreObserver" - type="android.backup.RestoreObserver" +<implements name="android.os.Parcelable"> +</implements> +<constructor name="AppWidgetProviderInfo" + type="android.appwidget.AppWidgetProviderInfo" static="false" final="false" deprecated="not deprecated" visibility="public" > </constructor> -</class> -<class name="RestoreSession" - extends="java.lang.Object" - abstract="false" +<constructor name="AppWidgetProviderInfo" + type="android.appwidget.AppWidgetProviderInfo" static="false" final="false" deprecated="not deprecated" visibility="public" > -<method name="endRestoreSession" - return="void" +<parameter name="in" type="android.os.Parcel"> +</parameter> +</constructor> +<method name="describeContents" + return="int" abstract="false" native="false" synchronized="false" @@ -28258,8 +28221,8 @@ visibility="public" > </method> -<method name="restorePackage" - return="int" +<method name="writeToParcel" + return="void" abstract="false" native="false" synchronized="false" @@ -28268,64 +28231,101 @@ deprecated="not deprecated" visibility="public" > -<parameter name="packageName" type="java.lang.String"> +<parameter name="out" type="android.os.Parcel"> </parameter> -<parameter name="observer" type="android.backup.RestoreObserver"> +<parameter name="flags" type="int"> </parameter> </method> -</class> -<class name="SharedPreferencesBackupHelper" - extends="android.backup.FileBackupHelperBase" - abstract="false" +<field name="CREATOR" + type="android.os.Parcelable.Creator" + transient="false" + volatile="false" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="configure" + type="android.content.ComponentName" + transient="false" + volatile="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<implements name="android.backup.BackupHelper"> -</implements> -<constructor name="SharedPreferencesBackupHelper" - type="android.backup.SharedPreferencesBackupHelper" +</field> +<field name="icon" + type="int" + transient="false" + volatile="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="context" type="android.content.Context"> -</parameter> -<parameter name="prefGroups" type="java.lang.String..."> -</parameter> -</constructor> -<method name="performBackup" - return="void" - abstract="false" - native="false" - synchronized="false" +</field> +<field name="initialLayout" + type="int" + transient="false" + volatile="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="oldState" type="android.os.ParcelFileDescriptor"> -</parameter> -<parameter name="data" type="android.backup.BackupDataOutput"> -</parameter> -<parameter name="newState" type="android.os.ParcelFileDescriptor"> -</parameter> -</method> -<method name="restoreEntity" - return="void" - abstract="false" - native="false" - synchronized="false" +</field> +<field name="label" + type="java.lang.String" + transient="false" + volatile="false" static="false" final="false" deprecated="not deprecated" visibility="public" > -<parameter name="data" type="android.backup.BackupDataInputStream"> -</parameter> -</method> +</field> +<field name="minHeight" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="minWidth" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="provider" + type="android.content.ComponentName" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="updatePeriodMillis" + type="int" + transient="false" + volatile="false" + static="false" + final="false" + deprecated="not deprecated" + visibility="public" +> +</field> </class> </package> <package name="android.bluetooth" diff --git a/cleanspec.mk b/cleanspec.mk index 683e303..9d9aa7e 100644 --- a/cleanspec.mk +++ b/cleanspec.mk @@ -1 +1,3 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/os/IDropBoxService.java) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/backup) +$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/com/android/internal/backup) diff --git a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java index 67c658d..d040b44 100644 --- a/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java +++ b/cmds/bmgr/src/com/android/commands/bmgr/Bmgr.java @@ -16,10 +16,10 @@ package com.android.commands.bmgr; -import android.backup.IBackupManager; -import android.backup.IRestoreObserver; -import android.backup.IRestoreSession; -import android.backup.RestoreSet; +import android.app.backup.RestoreSet; +import android.app.backup.IBackupManager; +import android.app.backup.IRestoreObserver; +import android.app.backup.IRestoreSession; import android.os.RemoteException; import android.os.ServiceManager; diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 0756c71..7c49bb7 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -16,6 +16,7 @@ package android.app; +import android.app.backup.BackupAgent; import android.content.BroadcastReceiver; import android.content.ComponentCallbacks; import android.content.ComponentName; diff --git a/core/java/android/app/FullBackupAgent.java b/core/java/android/app/FullBackupAgent.java index db198ad..dcfa63f 100644 --- a/core/java/android/app/FullBackupAgent.java +++ b/core/java/android/app/FullBackupAgent.java @@ -1,8 +1,9 @@ package android.app; -import android.backup.BackupDataInput; -import android.backup.BackupDataOutput; -import android.backup.FileBackupHelper; +import android.app.backup.BackupAgent; +import android.app.backup.BackupDataInput; +import android.app.backup.BackupDataOutput; +import android.app.backup.FileBackupHelper; import android.os.ParcelFileDescriptor; import android.util.Log; diff --git a/core/java/android/app/IBackupAgent.aidl b/core/java/android/app/IBackupAgent.aidl index 0de6ad9..fed2bc5 100644 --- a/core/java/android/app/IBackupAgent.aidl +++ b/core/java/android/app/IBackupAgent.aidl @@ -16,13 +16,13 @@ package android.app; -import android.backup.IBackupManager; +import android.app.backup.IBackupManager; import android.os.ParcelFileDescriptor; /** * Interface presented by applications being asked to participate in the - * backup & restore mechanism. End user code does not typically implement - * this interface; they subclass BackupAgent instead. + * backup & restore mechanism. End user code will not typically implement + * this interface directly; they subclass BackupAgent instead. * * {@hide} */ diff --git a/core/java/android/backup/AbsoluteFileBackupHelper.java b/core/java/android/app/backup/AbsoluteFileBackupHelper.java index 5a8034b..677224c 100644 --- a/core/java/android/backup/AbsoluteFileBackupHelper.java +++ b/core/java/android/app/backup/AbsoluteFileBackupHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.content.Context; import android.os.ParcelFileDescriptor; diff --git a/core/java/android/app/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java index 4695c21..d0cb148 100644 --- a/core/java/android/app/BackupAgent.java +++ b/core/java/android/app/backup/BackupAgent.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package android.app; +package android.app.backup; import android.app.IBackupAgent; -import android.backup.BackupDataInput; -import android.backup.BackupDataOutput; -import android.backup.IBackupManager; +import android.app.backup.IBackupManager; import android.content.Context; import android.content.ContextWrapper; import android.os.Binder; @@ -39,7 +37,7 @@ import java.io.IOException; * respectively. * <p> * A backup agent based on convenient helper classes is available in - * {@link android.backup.BackupHelperAgent} for less complex implementation + * {@link android.app.backup.BackupHelperAgent} for less complex implementation * requirements. * <p> * STOPSHIP write more documentation about the backup process here. @@ -87,7 +85,7 @@ public abstract class BackupAgent extends ContextWrapper { * The application is being restored from backup and should replace any * existing data with the contents of the backup. The backup data is * provided in the file descriptor pointed to by the - * {@link android.backup.BackupDataInput} instance <code>data</code>. Once + * {@link android.app.backup.BackupDataInput} instance <code>data</code>. Once * the restore is finished, the application should write a representation of * the final state to the <code>newState</code> file descriptor. * <p> diff --git a/core/java/android/backup/BackupDataInput.java b/core/java/android/app/backup/BackupDataInput.java index a08ee75..2da0c11 100644 --- a/core/java/android/backup/BackupDataInput.java +++ b/core/java/android/app/backup/BackupDataInput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import java.io.FileDescriptor; import java.io.IOException; @@ -131,7 +131,7 @@ public class BackupDataInput { /** * Consume the current record's data without actually reading it into a buffer - * for further processing. This allows a {@link android.app.BackupAgent} to + * for further processing. This allows a {@link android.app.backup.BackupAgent} to * efficiently discard obsolete or otherwise uninteresting records during the * restore operation. * diff --git a/core/java/android/backup/BackupDataInputStream.java b/core/java/android/app/backup/BackupDataInputStream.java index 503b3c1..a7f4ba6 100644 --- a/core/java/android/backup/BackupDataInputStream.java +++ b/core/java/android/app/backup/BackupDataInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import java.io.InputStream; import java.io.IOException; diff --git a/core/java/android/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java index 34879d8..53b1d46 100644 --- a/core/java/android/backup/BackupDataOutput.java +++ b/core/java/android/app/backup/BackupDataOutput.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import java.io.FileDescriptor; import java.io.IOException; diff --git a/core/java/android/backup/BackupHelper.java b/core/java/android/app/backup/BackupHelper.java index 7eedd01..dca2388 100644 --- a/core/java/android/backup/BackupHelper.java +++ b/core/java/android/app/backup/BackupHelper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.os.ParcelFileDescriptor; /** * A convenient interface to be used with the - * {@link android.backup.BackupHelperAgent} to implement backup and restore of + * {@link android.app.backup.BackupHelperAgent} to implement backup and restore of * arbitrary data types. * <p> * STOPSHOP: document! diff --git a/core/java/android/backup/BackupHelperAgent.java b/core/java/android/app/backup/BackupHelperAgent.java index 7fb44f4..6f4a031 100644 --- a/core/java/android/backup/BackupHelperAgent.java +++ b/core/java/android/app/backup/BackupHelperAgent.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; -import android.app.BackupAgent; import android.os.ParcelFileDescriptor; import java.io.IOException; diff --git a/core/java/android/backup/BackupHelperDispatcher.java b/core/java/android/app/backup/BackupHelperDispatcher.java index 68076db..5466db5 100644 --- a/core/java/android/backup/BackupHelperDispatcher.java +++ b/core/java/android/app/backup/BackupHelperDispatcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.os.ParcelFileDescriptor; import android.util.Log; diff --git a/core/java/android/backup/BackupManager.java b/core/java/android/app/backup/BackupManager.java index 2dff975..12d4daf 100644 --- a/core/java/android/backup/BackupManager.java +++ b/core/java/android/app/backup/BackupManager.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; -import android.backup.RestoreSession; +import android.app.backup.RestoreSession; +import android.app.backup.IBackupManager; +import android.app.backup.IRestoreSession; import android.content.Context; import android.os.RemoteException; import android.os.ServiceManager; @@ -34,12 +36,12 @@ import android.util.Log; * operation actually occurs. * <p> * The backup operation itself begins with the system launching the - * {@link android.app.BackupAgent} subclass declared in your manifest. See the - * documentation for {@link android.app.BackupAgent} for a detailed description + * {@link android.app.backup.BackupAgent} subclass declared in your manifest. See the + * documentation for {@link android.app.backup.BackupAgent} for a detailed description * 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.backup.BackupHelperAgent}. + * and files is available by using {@link android.app.backup.BackupHelperAgent}. * <p> * STOPSHIP: more documentation! * <p> @@ -82,7 +84,7 @@ public class BackupManager { /** * Notifies the Android backup system that your application wishes to back up * new changes to its data. A backup operation using your application's - * {@link android.app.BackupAgent} subclass will be scheduled when you call this method. + * {@link android.app.backup.BackupAgent} subclass will be scheduled when you call this method. */ public void dataChanged() { checkServiceBinder(); @@ -116,7 +118,7 @@ public class BackupManager { /** * Begin the process of restoring data from backup. See the - * {@link android.backup.RestoreSession} class for documentation on that process. + * {@link android.app.backup.RestoreSession} class for documentation on that process. */ public RestoreSession beginRestoreSession() { RestoreSession session = null; diff --git a/core/java/android/backup/FileBackupHelper.java b/core/java/android/app/backup/FileBackupHelper.java index cc859e2..b42049e 100644 --- a/core/java/android/backup/FileBackupHelper.java +++ b/core/java/android/app/backup/FileBackupHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.content.Context; import android.os.ParcelFileDescriptor; @@ -24,7 +24,7 @@ import java.io.File; /** * A helper class which can be used in conjunction with - * {@link android.backup.BackupHelperAgent} to manage the backup of a set of + * {@link android.app.backup.BackupHelperAgent} to manage the backup of a set of * files. Whenever backup is performed, all files changed since the last backup * will be saved in their entirety. During the first time the backup happens, * all the files in the list will be backed up. Note that this should only be @@ -69,9 +69,9 @@ public class FileBackupHelper extends FileBackupHelperBase implements BackupHelp * now. When <code>oldState</code> is <code>null</code>, all the files will * be backed up. * <p> - * This should be called from {@link android.backup.BackupHelperAgent} + * This should be called from {@link android.app.backup.BackupHelperAgent} * directly. See - * {@link android.app.BackupAgent#onBackup(ParcelFileDescriptor, BackupDataOutput, ParcelFileDescriptor)} + * {@link android.app.backup.BackupAgent#onBackup(ParcelFileDescriptor, BackupDataOutput, ParcelFileDescriptor)} * for a description of parameter meanings. */ public void performBackup(ParcelFileDescriptor oldState, BackupDataOutput data, diff --git a/core/java/android/backup/FileBackupHelperBase.java b/core/java/android/app/backup/FileBackupHelperBase.java index 7cb1ccc..1e3158f 100644 --- a/core/java/android/backup/FileBackupHelperBase.java +++ b/core/java/android/app/backup/FileBackupHelperBase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.content.Context; import android.os.ParcelFileDescriptor; @@ -24,7 +24,7 @@ import java.io.File; import java.io.FileDescriptor; /** - * Base class for the {@link android.backup.FileBackupHelper} implementation. + * Base class for the {@link android.app.backup.FileBackupHelper} implementation. */ class FileBackupHelperBase { private static final String TAG = "FileBackupHelperBase"; diff --git a/core/java/android/backup/IBackupManager.aidl b/core/java/android/app/backup/IBackupManager.aidl index d94b066..23d6351 100644 --- a/core/java/android/backup/IBackupManager.aidl +++ b/core/java/android/app/backup/IBackupManager.aidl @@ -14,16 +14,16 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; -import android.backup.IRestoreSession; +import android.app.backup.IRestoreSession; /** * Direct interface to the Backup Manager Service that applications invoke on. The only * operation currently needed is a simple notification that the app has made changes to * data it wishes to back up, so the system should run a backup pass. * - * Apps will use the {@link android.backup.BackupManager} class rather than going through + * Apps will use the {@link android.app.backup.BackupManager} class rather than going through * this Binder interface directly. * * {@hide} diff --git a/core/java/android/backup/IRestoreObserver.aidl b/core/java/android/app/backup/IRestoreObserver.aidl index 59e59fc..75d0d17 100644 --- a/core/java/android/backup/IRestoreObserver.aidl +++ b/core/java/android/app/backup/IRestoreObserver.aidl @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; /** * Callback class for receiving progress reports during a restore operation. diff --git a/core/java/android/backup/IRestoreSession.aidl b/core/java/android/app/backup/IRestoreSession.aidl index bead395..58c21fe 100644 --- a/core/java/android/backup/IRestoreSession.aidl +++ b/core/java/android/app/backup/IRestoreSession.aidl @@ -14,10 +14,10 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; -import android.backup.RestoreSet; -import android.backup.IRestoreObserver; +import android.app.backup.RestoreSet; +import android.app.backup.IRestoreObserver; /** * Binder interface used by clients who wish to manage a restore operation. Every diff --git a/core/java/android/backup/RestoreObserver.java b/core/java/android/app/backup/RestoreObserver.java index e4182750..7a5e10b 100644 --- a/core/java/android/backup/RestoreObserver.java +++ b/core/java/android/app/backup/RestoreObserver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; /** * Callback class for receiving progress reports during a restore operation. These diff --git a/core/java/android/backup/RestoreSession.java b/core/java/android/app/backup/RestoreSession.java index bc410c4..730a21f 100644 --- a/core/java/android/backup/RestoreSession.java +++ b/core/java/android/app/backup/RestoreSession.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; -import android.backup.IRestoreSession; -import android.backup.RestoreObserver; -import android.backup.RestoreSet; +import android.app.backup.RestoreObserver; +import android.app.backup.RestoreSet; +import android.app.backup.IRestoreObserver; +import android.app.backup.IRestoreSession; import android.content.Context; import android.os.Handler; import android.os.Message; diff --git a/core/java/android/backup/RestoreSet.aidl b/core/java/android/app/backup/RestoreSet.aidl index 42e77bf..ab1b125 100644 --- a/core/java/android/backup/RestoreSet.aidl +++ b/core/java/android/app/backup/RestoreSet.aidl @@ -14,6 +14,6 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; parcelable RestoreSet;
\ No newline at end of file diff --git a/core/java/android/backup/RestoreSet.java b/core/java/android/app/backup/RestoreSet.java index eeca148..0431977 100644 --- a/core/java/android/backup/RestoreSet.java +++ b/core/java/android/app/backup/RestoreSet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.os.Parcel; import android.os.Parcelable; diff --git a/core/java/android/backup/SharedPreferencesBackupHelper.java b/core/java/android/app/backup/SharedPreferencesBackupHelper.java index 7ba80db..d35b10c 100644 --- a/core/java/android/backup/SharedPreferencesBackupHelper.java +++ b/core/java/android/app/backup/SharedPreferencesBackupHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.backup; +package android.app.backup; import android.content.Context; import android.content.SharedPreferences; @@ -25,7 +25,7 @@ import java.io.File; /** * A helper class which can be used in conjunction with - * {@link android.backup.BackupHelperAgent} to manage the backup of + * {@link android.app.backup.BackupHelperAgent} to manage the backup of * {@link android.content.SharedPreferences}. Whenever backup is performed it * will back up all named shared preferences which have changed since the last * backup. diff --git a/core/java/android/backup/package.html b/core/java/android/app/backup/package.html index 13c0eb8..13c0eb8 100644 --- a/core/java/android/backup/package.html +++ b/core/java/android/app/backup/package.html diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 8d136f1..2b0e7e7 100644 --- a/core/java/android/content/Context.java +++ b/core/java/android/content/Context.java @@ -1489,7 +1489,7 @@ public abstract class Context { /** * Use with {@link #getSystemService} to retrieve an - * {@link android.backup.IBackupManager IBackupManager} for communicating + * {@link android.app.backup.IBackupManager IBackupManager} for communicating * with the backup mechanism. * @hide * diff --git a/core/java/com/android/internal/backup/IBackupTransport.aidl b/core/java/com/android/internal/backup/IBackupTransport.aidl index 9da1066..b535fc1 100644 --- a/core/java/com/android/internal/backup/IBackupTransport.aidl +++ b/core/java/com/android/internal/backup/IBackupTransport.aidl @@ -16,7 +16,7 @@ package com.android.internal.backup; -import android.backup.RestoreSet; +import android.app.backup.RestoreSet; import android.content.pm.PackageInfo; import android.os.ParcelFileDescriptor; diff --git a/core/java/com/android/internal/backup/LocalTransport.java b/core/java/com/android/internal/backup/LocalTransport.java index 23ec647..be83eb9 100644 --- a/core/java/com/android/internal/backup/LocalTransport.java +++ b/core/java/com/android/internal/backup/LocalTransport.java @@ -1,8 +1,8 @@ package com.android.internal.backup; -import android.backup.BackupDataInput; -import android.backup.BackupDataOutput; -import android.backup.RestoreSet; +import android.app.backup.BackupDataInput; +import android.app.backup.BackupDataOutput; +import android.app.backup.RestoreSet; import android.content.Context; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; diff --git a/core/jni/android_backup_BackupDataInput.cpp b/core/jni/android_backup_BackupDataInput.cpp index cf8a8e8..b03dd16 100644 --- a/core/jni/android_backup_BackupDataInput.cpp +++ b/core/jni/android_backup_BackupDataInput.cpp @@ -28,7 +28,7 @@ namespace android // java.io.FileDescriptor static jfieldID s_descriptorField = 0; -// android.backup.BackupDataInput$EntityHeader +// android.app.backup.BackupDataInput$EntityHeader static jfieldID s_keyField = 0; static jfieldID s_dataSizeField = 0; @@ -130,7 +130,7 @@ skipEntityData_native(JNIEnv* env, jobject clazz, int r) static const JNINativeMethod g_methods[] = { { "ctor", "(Ljava/io/FileDescriptor;)I", (void*)ctor_native }, { "dtor", "(I)V", (void*)dtor_native }, - { "readNextHeader_native", "(ILandroid/backup/BackupDataInput$EntityHeader;)I", + { "readNextHeader_native", "(ILandroid/app/backup/BackupDataInput$EntityHeader;)I", (void*)readNextHeader_native }, { "readEntityData_native", "(I[BII)I", (void*)readEntityData_native }, { "skipEntityData_native", "(I)I", (void*)skipEntityData_native }, @@ -148,16 +148,16 @@ int register_android_backup_BackupDataInput(JNIEnv* env) LOG_FATAL_IF(s_descriptorField == NULL, "Unable to find descriptor field in java.io.FileDescriptor"); - clazz = env->FindClass("android/backup/BackupDataInput$EntityHeader"); - LOG_FATAL_IF(clazz == NULL, "Unable to find class android.backup.BackupDataInput.EntityHeader"); + clazz = env->FindClass("android/app/backup/BackupDataInput$EntityHeader"); + LOG_FATAL_IF(clazz == NULL, "Unable to find class android.app.backup.BackupDataInput.EntityHeader"); s_keyField = env->GetFieldID(clazz, "key", "Ljava/lang/String;"); LOG_FATAL_IF(s_keyField == NULL, - "Unable to find key field in android.backup.BackupDataInput.EntityHeader"); + "Unable to find key field in android.app.backup.BackupDataInput.EntityHeader"); s_dataSizeField = env->GetFieldID(clazz, "dataSize", "I"); LOG_FATAL_IF(s_dataSizeField == NULL, - "Unable to find dataSize field in android.backup.BackupDataInput.EntityHeader"); + "Unable to find dataSize field in android.app.backup.BackupDataInput.EntityHeader"); - return AndroidRuntime::registerNativeMethods(env, "android/backup/BackupDataInput", + return AndroidRuntime::registerNativeMethods(env, "android/app/backup/BackupDataInput", g_methods, NELEM(g_methods)); } diff --git a/core/jni/android_backup_BackupHelperDispatcher.cpp b/core/jni/android_backup_BackupHelperDispatcher.cpp index 2e3f0b9..26e7d66 100644 --- a/core/jni/android_backup_BackupHelperDispatcher.cpp +++ b/core/jni/android_backup_BackupHelperDispatcher.cpp @@ -219,16 +219,16 @@ writeHeader_native(JNIEnv* env, jobject clazz, jobject headerObj, jobject fdObj, static const JNINativeMethod g_methods[] = { { "readHeader_native", - "(Landroid/backup/BackupHelperDispatcher$Header;Ljava/io/FileDescriptor;)I", + "(Landroid/app/backup/BackupHelperDispatcher$Header;Ljava/io/FileDescriptor;)I", (void*)readHeader_native }, { "skipChunk_native", "(Ljava/io/FileDescriptor;I)I", (void*)skipChunk_native }, { "allocateHeader_native", - "(Landroid/backup/BackupHelperDispatcher$Header;Ljava/io/FileDescriptor;)I", + "(Landroid/app/backup/BackupHelperDispatcher$Header;Ljava/io/FileDescriptor;)I", (void*)allocateHeader_native }, { "writeHeader_native", - "(Landroid/backup/BackupHelperDispatcher$Header;Ljava/io/FileDescriptor;I)I", + "(Landroid/app/backup/BackupHelperDispatcher$Header;Ljava/io/FileDescriptor;I)I", (void*)writeHeader_native }, }; @@ -242,17 +242,17 @@ int register_android_backup_BackupHelperDispatcher(JNIEnv* env) LOG_FATAL_IF(s_descriptorField == NULL, "Unable to find descriptor field in java.io.FileDescriptor"); - clazz = env->FindClass("android/backup/BackupHelperDispatcher$Header"); + clazz = env->FindClass("android/app/backup/BackupHelperDispatcher$Header"); LOG_FATAL_IF(clazz == NULL, - "Unable to find class android.backup.BackupHelperDispatcher.Header"); + "Unable to find class android.app.backup.BackupHelperDispatcher.Header"); s_chunkSizeField = env->GetFieldID(clazz, "chunkSize", "I"); LOG_FATAL_IF(s_chunkSizeField == NULL, - "Unable to find chunkSize field in android.backup.BackupHelperDispatcher.Header"); + "Unable to find chunkSize field in android.app.backup.BackupHelperDispatcher.Header"); s_keyPrefixField = env->GetFieldID(clazz, "keyPrefix", "Ljava/lang/String;"); LOG_FATAL_IF(s_keyPrefixField == NULL, - "Unable to find keyPrefix field in android.backup.BackupHelperDispatcher.Header"); + "Unable to find keyPrefix field in android.app.backup.BackupHelperDispatcher.Header"); - return AndroidRuntime::registerNativeMethods(env, "android/backup/BackupHelperDispatcher", + return AndroidRuntime::registerNativeMethods(env, "android/app/backup/BackupHelperDispatcher", g_methods, NELEM(g_methods)); } diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java index 2738efb..d5c9855 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsBackupAgent.java @@ -30,9 +30,9 @@ import java.io.IOException; import java.util.Arrays; import java.util.zip.CRC32; -import android.backup.BackupDataInput; -import android.backup.BackupDataOutput; -import android.backup.BackupHelperAgent; +import android.app.backup.BackupDataInput; +import android.app.backup.BackupDataOutput; +import android.app.backup.BackupHelperAgent; import android.content.ContentValues; import android.content.Context; import android.database.Cursor; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java index d24814d..0e75fbc 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java @@ -20,8 +20,8 @@ import java.util.Locale; import android.app.ActivityManagerNative; import android.app.IActivityManager; -import android.backup.BackupDataInput; -import android.backup.IBackupManager; +import android.app.backup.BackupDataInput; +import android.app.backup.IBackupManager; import android.content.ContentResolver; import android.content.Context; import android.content.IContentService; diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 4f1146b..7d648d3 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; -import android.backup.BackupManager; +import android.app.backup.BackupManager; import android.content.ContentProvider; import android.content.ContentUris; import android.content.ContentValues; diff --git a/services/java/com/android/server/BackupManagerService.java b/services/java/com/android/server/BackupManagerService.java index 8b0c264..ffba4ad 100644 --- a/services/java/com/android/server/BackupManagerService.java +++ b/services/java/com/android/server/BackupManagerService.java @@ -23,10 +23,10 @@ import android.app.IActivityManager; import android.app.IApplicationThread; import android.app.IBackupAgent; import android.app.PendingIntent; -import android.backup.IBackupManager; -import android.backup.IRestoreObserver; -import android.backup.IRestoreSession; -import android.backup.RestoreSet; +import android.app.backup.RestoreSet; +import android.app.backup.IBackupManager; +import android.app.backup.IRestoreObserver; +import android.app.backup.IRestoreSession; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; @@ -96,9 +96,9 @@ class BackupManagerService extends IBackupManager.Stub { // the first backup pass. private static final long FIRST_BACKUP_INTERVAL = 12 * AlarmManager.INTERVAL_HOUR; - private static final String RUN_BACKUP_ACTION = "android.backup.intent.RUN"; - private static final String RUN_INITIALIZE_ACTION = "android.backup.intent.INIT"; - private static final String RUN_CLEAR_ACTION = "android.backup.intent.CLEAR"; + private static final String RUN_BACKUP_ACTION = "android.app.backup.intent.RUN"; + private static final String RUN_INITIALIZE_ACTION = "android.app.backup.intent.INIT"; + private static final String RUN_CLEAR_ACTION = "android.app.backup.intent.CLEAR"; private static final int MSG_RUN_BACKUP = 1; private static final int MSG_RUN_FULL_BACKUP = 2; private static final int MSG_RUN_RESTORE = 3; diff --git a/services/java/com/android/server/PackageManagerBackupAgent.java b/services/java/com/android/server/PackageManagerBackupAgent.java index e45edfb..26b57bf 100644 --- a/services/java/com/android/server/PackageManagerBackupAgent.java +++ b/services/java/com/android/server/PackageManagerBackupAgent.java @@ -16,9 +16,9 @@ package com.android.server; -import android.app.BackupAgent; -import android.backup.BackupDataInput; -import android.backup.BackupDataOutput; +import android.app.backup.BackupAgent; +import android.app.backup.BackupDataInput; +import android.app.backup.BackupDataOutput; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java index 6ce2582..1ff0244 100644 --- a/services/java/com/android/server/PackageManagerService.java +++ b/services/java/com/android/server/PackageManagerService.java @@ -31,7 +31,7 @@ import android.app.ActivityManagerNative; import android.app.IActivityManager; import android.app.admin.DevicePolicyManager; import android.app.admin.IDevicePolicyManager; -import android.backup.IBackupManager; +import android.app.backup.IBackupManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; diff --git a/services/java/com/android/server/SystemBackupAgent.java b/services/java/com/android/server/SystemBackupAgent.java index 186aebe..86b9df6 100644 --- a/services/java/com/android/server/SystemBackupAgent.java +++ b/services/java/com/android/server/SystemBackupAgent.java @@ -16,12 +16,12 @@ package com.android.server; -import android.backup.AbsoluteFileBackupHelper; -import android.backup.BackupDataInput; -import android.backup.BackupDataInputStream; -import android.backup.BackupDataOutput; -import android.backup.BackupHelper; -import android.backup.BackupHelperAgent; +import android.app.backup.AbsoluteFileBackupHelper; +import android.app.backup.BackupDataInput; +import android.app.backup.BackupDataInputStream; +import android.app.backup.BackupDataOutput; +import android.app.backup.BackupHelper; +import android.app.backup.BackupHelperAgent; import android.content.Context; import android.os.ParcelFileDescriptor; import android.os.ServiceManager; diff --git a/services/java/com/android/server/WallpaperManagerService.java b/services/java/com/android/server/WallpaperManagerService.java index 7a03ebd..1b51741 100644 --- a/services/java/com/android/server/WallpaperManagerService.java +++ b/services/java/com/android/server/WallpaperManagerService.java @@ -23,7 +23,7 @@ import android.app.IWallpaperManager; import android.app.IWallpaperManagerCallback; import android.app.PendingIntent; import android.app.WallpaperInfo; -import android.backup.BackupManager; +import android.app.backup.BackupManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; diff --git a/services/java/com/android/server/WifiService.java b/services/java/com/android/server/WifiService.java index 7378333..8fa862d 100644 --- a/services/java/com/android/server/WifiService.java +++ b/services/java/com/android/server/WifiService.java @@ -79,7 +79,7 @@ import java.io.PrintWriter; import java.net.UnknownHostException; import com.android.internal.app.IBatteryStats; -import android.backup.IBackupManager; +import android.app.backup.IBackupManager; import com.android.server.am.BatteryStatsService; /** diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 9018872..b53100f 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -46,7 +46,7 @@ import android.app.Notification; import android.app.PendingIntent; import android.app.ResultInfo; import android.app.Service; -import android.backup.IBackupManager; +import android.app.backup.IBackupManager; import android.content.ActivityNotFoundException; import android.content.BroadcastReceiver; import android.content.ComponentName; diff --git a/tests/backup/src/com/android/backuptest/BackupTestActivity.java b/tests/backup/src/com/android/backuptest/BackupTestActivity.java index afbc703..e11ecad 100644 --- a/tests/backup/src/com/android/backuptest/BackupTestActivity.java +++ b/tests/backup/src/com/android/backuptest/BackupTestActivity.java @@ -17,11 +17,11 @@ package com.android.backuptest; import android.app.ListActivity; -import android.backup.BackupHelperDispatcher; -import android.backup.BackupDataInput; -import android.backup.BackupDataOutput; -import android.backup.BackupManager; -import android.backup.FileBackupHelper; +import android.app.backup.BackupHelperDispatcher; +import android.app.backup.BackupDataInput; +import android.app.backup.BackupDataOutput; +import android.app.backup.BackupManager; +import android.app.backup.FileBackupHelper; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; diff --git a/tests/backup/src/com/android/backuptest/BackupTestAgent.java b/tests/backup/src/com/android/backuptest/BackupTestAgent.java index 8e4fd39..3fdd96b 100644 --- a/tests/backup/src/com/android/backuptest/BackupTestAgent.java +++ b/tests/backup/src/com/android/backuptest/BackupTestAgent.java @@ -16,9 +16,9 @@ package com.android.backuptest; -import android.backup.BackupHelperAgent; -import android.backup.FileBackupHelper; -import android.backup.SharedPreferencesBackupHelper; +import android.app.backup.BackupHelperAgent; +import android.app.backup.FileBackupHelper; +import android.app.backup.SharedPreferencesBackupHelper; public class BackupTestAgent extends BackupHelperAgent { |