Merge "[KV] Move KVBT to its own package" (6721b209) · Commits · e / os / android_frameworks_base

services/art-profile

+14 −14

Original line number	Diff line number	Diff line
		@@ -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

services/backup/java/com/android/server/backup/BackupManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

services/backup/java/com/android/server/backup/internal/BackupHandler.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -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;

services/backup/java/com/android/server/backup/internal/BackupState.java

deleted100644 → 0

+0 −12

Original line number	Diff line number	Diff line
		package com.android.server.backup.internal;

		/**
		* Current state of the backup.
		*/
		enum BackupState {
		INITIAL,
		BACKUP_PM,
		RUNNING_QUEUE,
		CANCELLED,
		FINAL
		}

services/backup/java/com/android/server/backup/internal/BackupRequest.java→services/backup/java/com/android/server/backup/keyvalue/BackupRequest.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License
		*/

		package com.android.server.backup.internal;
		package com.android.server.backup.keyvalue;

		import java.util.Objects;