diff options
9 files changed, 49 insertions, 43 deletions
diff --git a/services/art-profile b/services/art-profile index 24964f32f63e..cbc00ea53427 100644 --- a/services/art-profile +++ b/services/art-profile @@ -9258,24 +9258,24 @@ PLcom/android/server/backup/internal/BackupRequest;->toString()Ljava/lang/String PLcom/android/server/backup/internal/BackupState;-><init>(Ljava/lang/String;I)V PLcom/android/server/backup/internal/BackupState;->values()[Lcom/android/server/backup/internal/BackupState; PLcom/android/server/backup/internal/Operation;-><init>(ILcom/android/server/backup/BackupRestoreTask;I)V -PLcom/android/server/backup/internal/KeyValueBackupTask;-><init>(Lcom/android/server/backup/BackupManagerService;Lcom/android/server/backup/transport/TransportClient;Ljava/lang/String;Ljava/util/List;Lcom/android/server/backup/DataChangedJournal;Landroid/app/backup/IBackupObserver;Landroid/app/backup/IBackupManagerMonitor;Lcom/android/server/backup/internal/OnTaskFinishedListener;Ljava/util/List;ZZ)V -PLcom/android/server/backup/internal/KeyValueBackupTask;->backupPm()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->beginBackup()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->clearAgentState()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->execute()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->executeNextState(Lcom/android/server/backup/internal/BackupState;)V -PLcom/android/server/backup/internal/KeyValueBackupTask;->finalizeBackup()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->invokeAgentForBackup(Ljava/lang/String;Landroid/app/IBackupAgent;)I -PLcom/android/server/backup/internal/KeyValueBackupTask;->invokeNextAgent()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->operationComplete(J)V -PLcom/android/server/backup/internal/KeyValueBackupTask;->registerTask()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->revertAndEndBackup()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->unregisterTask()V -PLcom/android/server/backup/internal/KeyValueBackupTask;->writeWidgetPayloadIfAppropriate(Ljava/io/FileDescriptor;Ljava/lang/String;)V PLcom/android/server/backup/internal/ProvisionedObserver;-><init>(Lcom/android/server/backup/BackupManagerService;Landroid/os/Handler;)V PLcom/android/server/backup/internal/RunBackupReceiver;-><init>(Lcom/android/server/backup/BackupManagerService;)V PLcom/android/server/backup/internal/RunBackupReceiver;->onReceive(Landroid/content/Context;Landroid/content/Intent;)V PLcom/android/server/backup/internal/RunInitializeReceiver;-><init>(Lcom/android/server/backup/BackupManagerService;)V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;-><init>(Lcom/android/server/backup/BackupManagerService;Lcom/android/server/backup/transport/TransportClient;Ljava/lang/String;Ljava/util/List;Lcom/android/server/backup/DataChangedJournal;Landroid/app/backup/IBackupObserver;Landroid/app/backup/IBackupManagerMonitor;Lcom/android/server/backup/internal/OnTaskFinishedListener;Ljava/util/List;ZZ)V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->backupPm()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->beginBackup()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->clearAgentState()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->execute()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->executeNextState(Lcom/android/server/backup/internal/BackupState;)V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->finalizeBackup()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->invokeAgentForBackup(Ljava/lang/String;Landroid/app/IBackupAgent;)I +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->invokeNextAgent()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->operationComplete(J)V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->registerTask()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->revertAndEndBackup()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->unregisterTask()V +PLcom/android/server/backup/keyvalue/KeyValueBackupTask;->writeWidgetPayloadIfAppropriate(Ljava/io/FileDescriptor;Ljava/lang/String;)V PLcom/android/server/backup/transport/-$$Lambda$TransportClient$ciIUj0x0CRg93UETUpy2FB5aqCQ;-><init>(Lcom/android/server/backup/transport/TransportClient;Lcom/android/server/backup/transport/TransportConnectionListener;Lcom/android/internal/backup/IBackupTransport;)V PLcom/android/server/backup/transport/-$$Lambda$TransportClient$ciIUj0x0CRg93UETUpy2FB5aqCQ;->run()V PLcom/android/server/backup/transport/-$$Lambda$TransportClient$uc3fygwQjQIS_JT7mlt-yMBfJcE;-><init>(Ljava/util/concurrent/CompletableFuture;)V diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index ec27da90106a..c26ac17c0c0e 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -104,7 +104,7 @@ import com.android.server.SystemService; import com.android.server.backup.fullbackup.FullBackupEntry; import com.android.server.backup.fullbackup.PerformFullTransportBackupTask; import com.android.server.backup.internal.BackupHandler; -import com.android.server.backup.internal.BackupRequest; +import com.android.server.backup.keyvalue.BackupRequest; import com.android.server.backup.internal.ClearDataObserver; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.internal.Operation; diff --git a/services/backup/java/com/android/server/backup/internal/BackupHandler.java b/services/backup/java/com/android/server/backup/internal/BackupHandler.java index 6e96fe0ba4ba..2722729b9f4c 100644 --- a/services/backup/java/com/android/server/backup/internal/BackupHandler.java +++ b/services/backup/java/com/android/server/backup/internal/BackupHandler.java @@ -41,6 +41,8 @@ import com.android.server.backup.DataChangedJournal; import com.android.server.backup.TransportManager; import com.android.server.backup.fullbackup.PerformAdbBackupTask; import com.android.server.backup.fullbackup.PerformFullTransportBackupTask; +import com.android.server.backup.keyvalue.BackupRequest; +import com.android.server.backup.keyvalue.KeyValueBackupTask; import com.android.server.backup.params.AdbBackupParams; import com.android.server.backup.params.AdbParams; import com.android.server.backup.params.AdbRestoreParams; diff --git a/services/backup/java/com/android/server/backup/internal/BackupState.java b/services/backup/java/com/android/server/backup/internal/BackupState.java deleted file mode 100644 index 320b55525ea4..000000000000 --- a/services/backup/java/com/android/server/backup/internal/BackupState.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.android.server.backup.internal; - -/** - * Current state of the backup. - */ -enum BackupState { - INITIAL, - BACKUP_PM, - RUNNING_QUEUE, - CANCELLED, - FINAL -} diff --git a/services/backup/java/com/android/server/backup/internal/BackupRequest.java b/services/backup/java/com/android/server/backup/keyvalue/BackupRequest.java index 01e43851661d..67b2f7282f64 100644 --- a/services/backup/java/com/android/server/backup/internal/BackupRequest.java +++ b/services/backup/java/com/android/server/backup/keyvalue/BackupRequest.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.server.backup.internal; +package com.android.server.backup.keyvalue; import java.util.Objects; diff --git a/services/backup/java/com/android/server/backup/internal/KeyValueBackupTask.java b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java index 54b8d1fa59af..113e2b67d04e 100644 --- a/services/backup/java/com/android/server/backup/internal/KeyValueBackupTask.java +++ b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupTask.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.server.backup.internal; +package com.android.server.backup.keyvalue; import static com.android.server.backup.BackupManagerService.DEBUG_BACKUP_TRACE; import static com.android.server.backup.BackupManagerService.KEY_WIDGET_STATE; @@ -62,6 +62,8 @@ import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.DataChangedJournal; import com.android.server.backup.KeyValueBackupJob; import com.android.server.backup.fullbackup.PerformFullTransportBackupTask; +import com.android.server.backup.internal.OnTaskFinishedListener; +import com.android.server.backup.internal.Operation; import com.android.server.backup.remote.RemoteCall; import com.android.server.backup.remote.RemoteCallable; import com.android.server.backup.remote.RemoteResult; @@ -1351,4 +1353,12 @@ public class KeyValueBackupTask implements BackupRestoreTask, Runnable { mPendingCall = null; return result; } + + private enum BackupState { + INITIAL, + BACKUP_PM, + RUNNING_QUEUE, + CANCELLED, + FINAL + } } diff --git a/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java b/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java index ea9967b6ea43..2e0ae02664b9 100644 --- a/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java +++ b/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java @@ -45,7 +45,7 @@ import android.os.PowerManager; import android.os.PowerSaveState; import android.platform.test.annotations.Presubmit; import android.provider.Settings; -import com.android.server.backup.internal.BackupRequest; +import com.android.server.backup.keyvalue.BackupRequest; import com.android.server.backup.testing.BackupManagerServiceTestUtils; import com.android.server.backup.testing.TransportData; import com.android.server.backup.testing.TransportTestUtils.TransportMock; diff --git a/services/robotests/src/com/android/server/backup/KeyValueBackupTaskTest.java b/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java index 56f5f15371ca..fde9bc898979 100644 --- a/services/robotests/src/com/android/server/backup/KeyValueBackupTaskTest.java +++ b/services/robotests/src/com/android/server/backup/keyvalue/KeyValueBackupTaskTest.java @@ -14,7 +14,7 @@ * limitations under the License */ -package com.android.server.backup; +package com.android.server.backup.keyvalue; import static android.app.backup.BackupManager.ERROR_AGENT_FAILURE; import static android.app.backup.BackupManager.ERROR_BACKUP_NOT_ALLOWED; @@ -25,9 +25,12 @@ import static android.app.backup.BackupManager.SUCCESS; import static android.app.backup.ForwardingBackupAgent.forward; import static com.android.server.backup.testing.BackupManagerServiceTestUtils.createBackupWakeLock; -import static com.android.server.backup.testing.BackupManagerServiceTestUtils.createInitializedBackupManagerService; -import static com.android.server.backup.testing.BackupManagerServiceTestUtils.setUpBackupManagerServiceBasics; -import static com.android.server.backup.testing.BackupManagerServiceTestUtils.setUpBinderCallerAndApplicationAsSystem; +import static com.android.server.backup.testing.BackupManagerServiceTestUtils + .createInitializedBackupManagerService; +import static com.android.server.backup.testing.BackupManagerServiceTestUtils + .setUpBackupManagerServiceBasics; +import static com.android.server.backup.testing.BackupManagerServiceTestUtils + .setUpBinderCallerAndApplicationAsSystem; import static com.android.server.backup.testing.PackageData.PM_PACKAGE; import static com.android.server.backup.testing.PackageData.fullBackupPackage; import static com.android.server.backup.testing.PackageData.keyValuePackage; @@ -90,10 +93,14 @@ import android.util.Pair; import com.android.internal.backup.IBackupTransport; import com.android.server.EventLogTags; +import com.android.server.backup.BackupManagerService; +import com.android.server.backup.BackupRestoreTask; +import com.android.server.backup.DataChangedJournal; +import com.android.server.backup.KeyValueBackupJob; +import com.android.server.backup.PackageManagerBackupAgent; +import com.android.server.backup.TransportManager; import com.android.server.backup.internal.BackupHandler; -import com.android.server.backup.internal.BackupRequest; import com.android.server.backup.internal.OnTaskFinishedListener; -import com.android.server.backup.internal.KeyValueBackupTask; import com.android.server.backup.testing.PackageData; import com.android.server.backup.testing.TransportData; import com.android.server.backup.testing.TransportTestUtils; @@ -1795,10 +1802,10 @@ public class KeyValueBackupTaskTest { * <li>The transport being initialized with {@link IBackupTransport#initializeDevice()} * <li>{@link BackupManagerService#resetBackupState(File)} being called, which will: * <ul> - * <li>Call {@link ProcessedPackagesJournal#reset()} - * <li>Reset current token to 0 - * <li>Delete state files - * <li>Mark data changed for every key-value participant + * <li>Reset processed packages journal. + * <li>Reset current token to 0. + * <li>Delete state files. + * <li>Mark data changed for every key-value participant. * </ul> * </ul> */ diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java index f22cdb8f5860..838902d43031 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java @@ -22,15 +22,14 @@ import android.app.backup.IBackupObserver; import com.android.server.backup.BackupManagerService; import com.android.server.backup.DataChangedJournal; -import com.android.server.backup.internal.BackupRequest; import com.android.server.backup.internal.OnTaskFinishedListener; -import com.android.server.backup.internal.KeyValueBackupTask; +import com.android.server.backup.keyvalue.BackupRequest; +import com.android.server.backup.keyvalue.KeyValueBackupTask; import com.android.server.backup.transport.TransportClient; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; -import java.util.ArrayList; import java.util.List; @Implements(KeyValueBackupTask.class) |