diff options
| author | 2021-12-07 13:15:42 +0000 | |
|---|---|---|
| committer | 2021-12-14 10:32:15 +0000 | |
| commit | c1e318361832688d735c01dfab5118633428e20e (patch) | |
| tree | f942f587dcd30bb87409448b1826574eb1aa29c5 /services/robotests/src | |
| parent | a933cf1b94c6cce02ff5b22afb20c70fe8ee947c (diff) | |
Refactor UBMS to use LifecycleOperationStorage.
Several other related classes are also updated to have a
dependency on OperationStorage, which removes a number of
tight bindings on UserBackupManagerService.
BUG: 161089758
Test: atest BackupFrameworksServicesRoboTests
atest CtsBackupHostTestCases
atest CtsBackupTestCases
atest GtsBackupTestCases
Change-Id: I644ef2cd1a3e8d8c35a269c140df8cc5f3654e16
Diffstat (limited to 'services/robotests/src')
2 files changed, 4 insertions, 0 deletions
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 06b7fb7e6ae3..6a7d03176b1c 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowKeyValueBackupTask.java @@ -19,6 +19,7 @@ package com.android.server.testing.shadows; import android.annotation.Nullable; import com.android.server.backup.DataChangedJournal; +import com.android.server.backup.OperationStorage; import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.keyvalue.KeyValueBackupReporter; @@ -56,6 +57,7 @@ public class ShadowKeyValueBackupTask { @Implementation protected void __constructor__( UserBackupManagerService backupManagerService, + OperationStorage operationStorage, TransportConnection transportConnection, String transportDirName, List<String> queue, diff --git a/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java b/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java index 71010a9fe935..d985e1b0f341 100644 --- a/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java +++ b/services/robotests/src/com/android/server/testing/shadows/ShadowPerformUnifiedRestoreTask.java @@ -21,6 +21,7 @@ import android.app.backup.IBackupManagerMonitor; import android.app.backup.IRestoreObserver; import android.content.pm.PackageInfo; +import com.android.server.backup.OperationStorage; import com.android.server.backup.UserBackupManagerService; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.restore.PerformUnifiedRestoreTask; @@ -57,6 +58,7 @@ public class ShadowPerformUnifiedRestoreTask { @Implementation protected void __constructor__( UserBackupManagerService backupManagerService, + OperationStorage operationStorage, TransportConnection transportConnection, IRestoreObserver observer, IBackupManagerMonitor monitor, |