* 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 data. Once
+ * {@link android.app.backup.BackupDataInput} instance data. Once
* the restore is finished, the application should write a representation of
* the final state to the newState file descriptor.
*
diff --git a/core/java/android/backup/BackupDataInput.java b/core/java/android/app/backup/BackupDataInput.java similarity index 99% rename from core/java/android/backup/BackupDataInput.java rename to core/java/android/app/backup/BackupDataInput.java index a08ee75861f0a..2da0c11182b87 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 similarity index 98% rename from core/java/android/backup/BackupDataInputStream.java rename to core/java/android/app/backup/BackupDataInputStream.java index 503b3c1ba6463..a7f4ba6388fb2 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 similarity index 99% rename from core/java/android/backup/BackupDataOutput.java rename to core/java/android/app/backup/BackupDataOutput.java index 34879d8b960c3..53b1d46f227ac 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 similarity index 94% rename from core/java/android/backup/BackupHelper.java rename to core/java/android/app/backup/BackupHelper.java index 7eedd01cd2ed6..dca23881a8fcc 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. *
* STOPSHOP: document! diff --git a/core/java/android/backup/BackupHelperAgent.java b/core/java/android/app/backup/BackupHelperAgent.java similarity index 97% rename from core/java/android/backup/BackupHelperAgent.java rename to core/java/android/app/backup/BackupHelperAgent.java index 7fb44f48c92d0..6f4a0316c1418 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 similarity index 99% rename from core/java/android/backup/BackupHelperDispatcher.java rename to core/java/android/app/backup/BackupHelperDispatcher.java index 68076db5d0dca..5466db5615767 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 similarity index 88% rename from core/java/android/backup/BackupManager.java rename to core/java/android/app/backup/BackupManager.java index 2dff975fc0fc6..12d4daf099004 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. *
* 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. *
* 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}. *
* STOPSHIP: more documentation! *
@@ -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
similarity index 92%
rename from core/java/android/backup/FileBackupHelper.java
rename to core/java/android/app/backup/FileBackupHelper.java
index cc859e24df619..b42049eb91b9e 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 oldState is null, all the files will
* be backed up.
*
- * 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 similarity index 97% rename from core/java/android/backup/FileBackupHelperBase.java rename to core/java/android/app/backup/FileBackupHelperBase.java index 7cb1ccca58ae5..1e3158fc6fe58 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 similarity index 97% rename from core/java/android/backup/IBackupManager.aidl rename to core/java/android/app/backup/IBackupManager.aidl index d94b0663cc0c5..23d6351167624 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 similarity index 98% rename from core/java/android/backup/IRestoreObserver.aidl rename to core/java/android/app/backup/IRestoreObserver.aidl index 59e59fc1f70aa..75d0d175fdfcc 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 similarity index 96% rename from core/java/android/backup/IRestoreSession.aidl rename to core/java/android/app/backup/IRestoreSession.aidl index bead395a752cd..58c21fea40a88 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 similarity index 98% rename from core/java/android/backup/RestoreObserver.java rename to core/java/android/app/backup/RestoreObserver.java index e41827503f445..7a5e10b72ea71 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 similarity index 97% rename from core/java/android/backup/RestoreSession.java rename to core/java/android/app/backup/RestoreSession.java index bc410c49d9678..730a21ffcfd52 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 similarity index 92% rename from core/java/android/backup/RestoreSet.aidl rename to core/java/android/app/backup/RestoreSet.aidl index 42e77bfe59901..ab1b125991ad5 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 similarity index 98% rename from core/java/android/backup/RestoreSet.java rename to core/java/android/app/backup/RestoreSet.java index eeca148667f3a..0431977cdecd9 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 similarity index 96% rename from core/java/android/backup/SharedPreferencesBackupHelper.java rename to core/java/android/app/backup/SharedPreferencesBackupHelper.java index 7ba80db3c1caf..d35b10c714f49 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 similarity index 100% rename from core/java/android/backup/package.html rename to core/java/android/app/backup/package.html diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java index 8d136f1f312c9..2b0e7e7456d89 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 9da1066d1d69c..b535fc1ba6ebc 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 23ec6470a7ab7..be83eb9574f7f 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 cf8a8e8a5efa4..b03dd16351fcd 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 2e3f0b969127b..26e7d66da24d8 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 2738efbd218ca..d5c9855ab045b 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 d24814d9b6a18..0e75fbceed4af 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 4f1146b7ca7f3..7d648d3a6e20f 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 8b0c2648c63fd..ffba4ad326605 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 e45edfbaa7e9d..26b57bf51667a 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 6ce25824b8472..1ff0244a98bdb 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 186aebe0f8b64..86b9df639c713 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 7a03ebd365ed6..1b5174145c596 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 7378333f9204b..8fa862dea6c90 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 9018872eba108..b53100f43557d 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 afbc70304ea4d..e11ecade4d74a 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 8e4fd39aa7cf3..3fdd96b8d06b8 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 {