diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2018-01-25 15:24:00 +0000 |
|---|---|---|
| committer | Michal Karpinski <mkarpinski@google.com> | 2018-01-26 10:37:32 +0000 |
| commit | fe4ae0c5b1bc3b31adc4cc2c5a0197e29e97b6bc (patch) | |
| tree | be5ee1a4cb2113a220cf4a8a7fdfcb33fd1f2dd4 | |
| parent | 1caef5b882111f1911fd3438fb11fbf5793a89a5 (diff) | |
Rename RefactoredBackupManagerService to BackupManagerService
The interface will be removed in a subsequent CL, it will be
easier to deal with merge conflicts.
Test: 1) m -j RunFrameworksServicesRoboTests
2) runtest -p com.android.server.backup frameworks-services
Bug: 65823538
Change-Id: I37c4c6758c646e1b18889ed05aa1b1d7c6129cf0
44 files changed, 285 insertions, 310 deletions
diff --git a/services/art-profile b/services/art-profile index 301918fbe1c8..d2cde029b490 100644 --- a/services/art-profile +++ b/services/art-profile @@ -2134,15 +2134,15 @@ HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->requestHideFil HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->requestShowFillUi(Landroid/view/autofill/AutofillId;IILandroid/view/autofill/IAutofillWindowPresenter;)V HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->save()V HPLcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;->startIntentSender(Landroid/content/IntentSender;)V -HPLcom/android/server/backup/RefactoredBackupManagerService;->addPackageParticipantsLockedInner(Ljava/lang/String;Ljava/util/List;)V -HPLcom/android/server/backup/RefactoredBackupManagerService;->allAgentPackages()Ljava/util/List; -HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChanged(Ljava/lang/String;)V -HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChangedImpl(Ljava/lang/String;)V -HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChangedImpl(Ljava/lang/String;Ljava/util/HashSet;)V -HPLcom/android/server/backup/RefactoredBackupManagerService;->dataChangedTargets(Ljava/lang/String;)Ljava/util/HashSet; -HPLcom/android/server/backup/RefactoredBackupManagerService;->dequeueFullBackupLocked(Ljava/lang/String;)V -HPLcom/android/server/backup/RefactoredBackupManagerService;->readFullBackupSchedule()Ljava/util/ArrayList; -HPLcom/android/server/backup/RefactoredBackupManagerService;->writeToJournalLocked(Ljava/lang/String;)V +HPLcom/android/server/backup/BackupManagerService;->addPackageParticipantsLockedInner(Ljava/lang/String;Ljava/util/List;)V +HPLcom/android/server/backup/BackupManagerService;->allAgentPackages()Ljava/util/List; +HPLcom/android/server/backup/BackupManagerService;->dataChanged(Ljava/lang/String;)V +HPLcom/android/server/backup/BackupManagerService;->dataChangedImpl(Ljava/lang/String;)V +HPLcom/android/server/backup/BackupManagerService;->dataChangedImpl(Ljava/lang/String;Ljava/util/HashSet;)V +HPLcom/android/server/backup/BackupManagerService;->dataChangedTargets(Ljava/lang/String;)Ljava/util/HashSet; +HPLcom/android/server/backup/BackupManagerService;->dequeueFullBackupLocked(Ljava/lang/String;)V +HPLcom/android/server/backup/BackupManagerService;->readFullBackupSchedule()Ljava/util/ArrayList; +HPLcom/android/server/backup/BackupManagerService;->writeToJournalLocked(Ljava/lang/String;)V HPLcom/android/server/backup/BackupManagerServiceInterface;->acknowledgeAdbBackupOrRestore(IZLjava/lang/String;Ljava/lang/String;Landroid/app/backup/IFullBackupRestoreObserver;)V HPLcom/android/server/backup/BackupManagerServiceInterface;->adbBackup(Landroid/os/ParcelFileDescriptor;ZZZZZZZZ[Ljava/lang/String;)V HPLcom/android/server/backup/BackupManagerServiceInterface;->adbRestore(Landroid/os/ParcelFileDescriptor;)V @@ -9358,37 +9358,37 @@ PLcom/android/server/autofill/ui/AutoFillUI;->lambda$-com_android_server_autofil PLcom/android/server/autofill/ui/AutoFillUI;->lambda$-com_android_server_autofill_ui_AutoFillUI_4826(Lcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;Ljava/lang/String;)V PLcom/android/server/autofill/ui/AutoFillUI;->setCallback(Lcom/android/server/autofill/ui/AutoFillUI$AutoFillUiCallback;)V PLcom/android/server/autofill/ui/OverlayControl;-><init>(Landroid/content/Context;)V -PLcom/android/server/backup/RefactoredBackupManagerService$Lifecycle;-><init>(Landroid/content/Context;)V -PLcom/android/server/backup/RefactoredBackupManagerService$Lifecycle;->onStart()V -PLcom/android/server/backup/RefactoredBackupManagerService$Lifecycle;->onUnlockUser(I)V -PLcom/android/server/backup/RefactoredBackupManagerService;-><init>(Landroid/content/Context;Lcom/android/server/backup/Trampoline;)V -PLcom/android/server/backup/RefactoredBackupManagerService;->addPackageParticipantsLocked([Ljava/lang/String;)V -PLcom/android/server/backup/RefactoredBackupManagerService;->backupSettingMigrated(I)Z -PLcom/android/server/backup/RefactoredBackupManagerService;->enqueueFullBackup(Ljava/lang/String;J)V -PLcom/android/server/backup/RefactoredBackupManagerService;->getCurrentTransport()Ljava/lang/String; -PLcom/android/server/backup/RefactoredBackupManagerService;->initPackageTracking()V -PLcom/android/server/backup/RefactoredBackupManagerService;->isBackupEnabled()Z -PLcom/android/server/backup/RefactoredBackupManagerService;->parseLeftoverJournals()V -PLcom/android/server/backup/RefactoredBackupManagerService;->readBackupEnableState(I)Z -PLcom/android/server/backup/RefactoredBackupManagerService;->removePackageFromSetLocked(Ljava/util/HashSet;Ljava/lang/String;)V -PLcom/android/server/backup/RefactoredBackupManagerService;->removePackageParticipantsLocked([Ljava/lang/String;I)V -PLcom/android/server/backup/RefactoredBackupManagerService;->scheduleNextFullBackupJob(J)V -PLcom/android/server/backup/RefactoredBackupManagerService;->selectBackupTransportAsync(Landroid/content/ComponentName;Landroid/app/backup/ISelectBackupTransportCallback;)V -PLcom/android/server/backup/RefactoredBackupManagerService;->setBackupEnabled(Z)V -PLcom/android/server/backup/RefactoredBackupManagerService;->updateStateForTransport(Ljava/lang/String;)V -PLcom/android/server/backup/RefactoredBackupManagerService;->writeBackupEnableState(ZI)V -PLcom/android/server/backup/RefactoredBackupManagerService;->writeFullBackupScheduleAsync()V +PLcom/android/server/backup/BackupManagerService$Lifecycle;-><init>(Landroid/content/Context;)V +PLcom/android/server/backup/BackupManagerService$Lifecycle;->onStart()V +PLcom/android/server/backup/BackupManagerService$Lifecycle;->onUnlockUser(I)V +PLcom/android/server/backup/BackupManagerService;-><init>(Landroid/content/Context;Lcom/android/server/backup/Trampoline;)V +PLcom/android/server/backup/BackupManagerService;->addPackageParticipantsLocked([Ljava/lang/String;)V +PLcom/android/server/backup/BackupManagerService;->backupSettingMigrated(I)Z +PLcom/android/server/backup/BackupManagerService;->enqueueFullBackup(Ljava/lang/String;J)V +PLcom/android/server/backup/BackupManagerService;->getCurrentTransport()Ljava/lang/String; +PLcom/android/server/backup/BackupManagerService;->initPackageTracking()V +PLcom/android/server/backup/BackupManagerService;->isBackupEnabled()Z +PLcom/android/server/backup/BackupManagerService;->parseLeftoverJournals()V +PLcom/android/server/backup/BackupManagerService;->readBackupEnableState(I)Z +PLcom/android/server/backup/BackupManagerService;->removePackageFromSetLocked(Ljava/util/HashSet;Ljava/lang/String;)V +PLcom/android/server/backup/BackupManagerService;->removePackageParticipantsLocked([Ljava/lang/String;I)V +PLcom/android/server/backup/BackupManagerService;->scheduleNextFullBackupJob(J)V +PLcom/android/server/backup/BackupManagerService;->selectBackupTransportAsync(Landroid/content/ComponentName;Landroid/app/backup/ISelectBackupTransportCallback;)V +PLcom/android/server/backup/BackupManagerService;->setBackupEnabled(Z)V +PLcom/android/server/backup/BackupManagerService;->updateStateForTransport(Ljava/lang/String;)V +PLcom/android/server/backup/BackupManagerService;->writeBackupEnableState(ZI)V +PLcom/android/server/backup/BackupManagerService;->writeFullBackupScheduleAsync()V PLcom/android/server/backup/FullBackupJob;->schedule(Landroid/content/Context;J)V PLcom/android/server/backup/KeyValueBackupJob;->cancel(Landroid/content/Context;)V PLcom/android/server/backup/Trampoline;-><init>(Landroid/content/Context;)V -PLcom/android/server/backup/Trampoline;->createRefactoredBackupManagerService()Lcom/android/server/backup/BackupManagerServiceInterface; +PLcom/android/server/backup/Trampoline;->createBackupManagerService()Lcom/android/server/backup/BackupManagerServiceInterface; PLcom/android/server/backup/Trampoline;->createService()Lcom/android/server/backup/BackupManagerServiceInterface; PLcom/android/server/backup/Trampoline;->getCurrentTransport()Ljava/lang/String; PLcom/android/server/backup/Trampoline;->getSuppressFile()Ljava/io/File; PLcom/android/server/backup/Trampoline;->initialize(I)V PLcom/android/server/backup/Trampoline;->isBackupDisabled()Z PLcom/android/server/backup/Trampoline;->isBackupEnabled()Z -PLcom/android/server/backup/Trampoline;->isRefactoredServiceEnabled()Z +PLcom/android/server/backup/Trampoline;->isServiceEnabled()Z PLcom/android/server/backup/Trampoline;->selectBackupTransportAsync(Landroid/content/ComponentName;Landroid/app/backup/ISelectBackupTransportCallback;)V PLcom/android/server/backup/Trampoline;->setBackupEnabled(Z)V PLcom/android/server/backup/TransportManager$RebindOnTimeoutHandler;-><init>(Lcom/android/server/backup/TransportManager;Landroid/os/Looper;)V @@ -9422,13 +9422,13 @@ PLcom/android/server/backup/TransportManager;->onPackageChanged(Ljava/lang/Strin PLcom/android/server/backup/TransportManager;->registerAllTransports()V PLcom/android/server/backup/TransportManager;->selectTransport(Ljava/lang/String;)Ljava/lang/String; PLcom/android/server/backup/TransportManager;->tryBindTransport(Landroid/content/ComponentName;)V -PLcom/android/server/backup/internal/BackupHandler;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;Landroid/os/Looper;)V +PLcom/android/server/backup/internal/BackupHandler;-><init>(Lcom/android/server/backup/BackupManagerService;Landroid/os/Looper;)V PLcom/android/server/backup/fullbackup/FullBackupEntry;->compareTo(Lcom/android/server/backup/fullbackup/FullBackupEntry;)I PLcom/android/server/backup/fullbackup/FullBackupEntry;->compareTo(Ljava/lang/Object;)I PLcom/android/server/backup/internal/BackupHandler;->handleMessage(Landroid/os/Message;)V -PLcom/android/server/backup/internal/ProvisionedObserver;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;Landroid/os/Handler;)V -PLcom/android/server/backup/internal/RunBackupReceiver;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;)V -PLcom/android/server/backup/internal/RunInitializeReceiver;-><init>(Lcom/android/server/backup/RefactoredBackupManagerService;)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/RunInitializeReceiver;-><init>(Lcom/android/server/backup/BackupManagerService;)V PLcom/android/server/backup/utils/AppBackupUtils;->appGetsFullBackup(Landroid/content/pm/PackageInfo;)Z PLcom/android/server/camera/CameraServiceProxy$1;-><init>(Lcom/android/server/camera/CameraServiceProxy;)V PLcom/android/server/camera/CameraServiceProxy$2;-><init>(Lcom/android/server/camera/CameraServiceProxy;)V diff --git a/services/backup/java/com/android/server/backup/BackupManagerConstants.java b/services/backup/java/com/android/server/backup/BackupManagerConstants.java index 1a54e95789d0..99160c24d3b4 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerConstants.java +++ b/services/backup/java/com/android/server/backup/BackupManagerConstants.java @@ -18,8 +18,6 @@ package com.android.server.backup; import android.app.AlarmManager; import android.content.ContentResolver; -import android.content.Context; -import android.content.res.Resources; import android.database.ContentObserver; import android.net.Uri; import android.os.Handler; @@ -133,7 +131,7 @@ class BackupManagerConstants extends ContentObserver { // group the calls of these methods in a block syncrhonized on // a reference of this object. public synchronized long getKeyValueBackupIntervalMilliseconds() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getKeyValueBackupIntervalMilliseconds(...) returns " + mKeyValueBackupIntervalMilliseconds); } @@ -141,7 +139,7 @@ class BackupManagerConstants extends ContentObserver { } public synchronized long getKeyValueBackupFuzzMilliseconds() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getKeyValueBackupFuzzMilliseconds(...) returns " + mKeyValueBackupFuzzMilliseconds); } @@ -149,7 +147,7 @@ class BackupManagerConstants extends ContentObserver { } public synchronized boolean getKeyValueBackupRequireCharging() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getKeyValueBackupRequireCharging(...) returns " + mKeyValueBackupRequireCharging); } @@ -157,7 +155,7 @@ class BackupManagerConstants extends ContentObserver { } public synchronized int getKeyValueBackupRequiredNetworkType() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getKeyValueBackupRequiredNetworkType(...) returns " + mKeyValueBackupRequiredNetworkType); } @@ -165,7 +163,7 @@ class BackupManagerConstants extends ContentObserver { } public synchronized long getFullBackupIntervalMilliseconds() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getFullBackupIntervalMilliseconds(...) returns " + mFullBackupIntervalMilliseconds); } @@ -173,14 +171,14 @@ class BackupManagerConstants extends ContentObserver { } public synchronized boolean getFullBackupRequireCharging() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getFullBackupRequireCharging(...) returns " + mFullBackupRequireCharging); } return mFullBackupRequireCharging; } public synchronized int getFullBackupRequiredNetworkType() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getFullBackupRequiredNetworkType(...) returns " + mFullBackupRequiredNetworkType); } @@ -191,7 +189,7 @@ class BackupManagerConstants extends ContentObserver { * Returns an array of package names that should be notified whenever a backup finishes. */ public synchronized String[] getBackupFinishedNotificationReceivers() { - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "getBackupFinishedNotificationReceivers(...) returns " + TextUtils.join(", ", mBackupFinishedNotificationReceivers)); } diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index dc20d31c2f51..14b76ab64fa8 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -38,7 +38,6 @@ import android.app.AppGlobals; import android.app.IActivityManager; import android.app.IBackupAgent; import android.app.PendingIntent; -import android.app.admin.DevicePolicyManager; import android.app.backup.BackupManager; import android.app.backup.BackupManagerMonitor; import android.app.backup.FullBackup; @@ -158,7 +157,7 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -public class RefactoredBackupManagerService implements BackupManagerServiceInterface { +public class BackupManagerService implements BackupManagerServiceInterface { public static final String TAG = "BackupManagerService"; public static final boolean DEBUG = true; @@ -628,7 +627,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter * A BackupRestore task gets notified of ack/timeout for the operation via * BackupRestoreTask#handleCancel, BackupRestoreTask#operationComplete and notifyAll called * on the mCurrentOpLock. - * {@link RefactoredBackupManagerService#waitUntilOperationComplete(int)} is + * {@link BackupManagerService#waitUntilOperationComplete(int)} is * used in various places to 'wait' for notifyAll and detect change of pending state of an * operation. So typically, an operation will be removed from this array by: * - BackupRestoreTask#handleCancel and @@ -739,7 +738,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // ----- Main service implementation ----- - public static RefactoredBackupManagerService create( + public static BackupManagerService create( Context context, Trampoline parent, HandlerThread backupThread) { @@ -772,7 +771,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter // This dir on /cache is managed directly in init.rc File dataDir = new File(Environment.getDownloadCacheDirectory(), "backup_stage"); - return new RefactoredBackupManagerService( + return new BackupManagerService( context, parent, backupThread, @@ -782,7 +781,7 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter } @VisibleForTesting - RefactoredBackupManagerService( + BackupManagerService( Context context, Trampoline parent, HandlerThread backupThread, diff --git a/services/backup/java/com/android/server/backup/FileMetadata.java b/services/backup/java/com/android/server/backup/FileMetadata.java index 3d260cba4a16..fe75041eeaca 100644 --- a/services/backup/java/com/android/server/backup/FileMetadata.java +++ b/services/backup/java/com/android/server/backup/FileMetadata.java @@ -16,7 +16,7 @@ package com.android.server.backup; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.BackupAgent; import android.util.Slog; diff --git a/services/backup/java/com/android/server/backup/FullBackupJob.java b/services/backup/java/com/android/server/backup/FullBackupJob.java index b81a54d3e2b0..82638b4ecee4 100644 --- a/services/backup/java/com/android/server/backup/FullBackupJob.java +++ b/services/backup/java/com/android/server/backup/FullBackupJob.java @@ -61,7 +61,7 @@ public class FullBackupJob extends JobService { @Override public boolean onStartJob(JobParameters params) { mParams = params; - Trampoline service = RefactoredBackupManagerService.getInstance(); + Trampoline service = BackupManagerService.getInstance(); return service.beginFullBackup(this); } @@ -69,7 +69,7 @@ public class FullBackupJob extends JobService { public boolean onStopJob(JobParameters params) { if (mParams != null) { mParams = null; - Trampoline service = RefactoredBackupManagerService.getInstance(); + Trampoline service = BackupManagerService.getInstance(); service.endFullBackup(); } return false; diff --git a/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java b/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java index 42785be779de..47558775d19e 100644 --- a/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java +++ b/services/backup/java/com/android/server/backup/KeyValueAdbBackupEngine.java @@ -4,8 +4,8 @@ import static android.os.ParcelFileDescriptor.MODE_CREATE; import static android.os.ParcelFileDescriptor.MODE_READ_ONLY; import static android.os.ParcelFileDescriptor.MODE_READ_WRITE; import static android.os.ParcelFileDescriptor.MODE_TRUNCATE; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP_WAIT; +import static com.android.server.backup.BackupManagerService.TIMEOUT_BACKUP_INTERVAL; import android.app.ApplicationThreadConstants; import android.app.IBackupAgent; @@ -80,7 +80,7 @@ public class KeyValueAdbBackupEngine { mNewStateName = new File(mStateDir, pkg + BACKUP_KEY_VALUE_NEW_STATE_FILENAME_SUFFIX); - mManifestFile = new File(mDataDir, RefactoredBackupManagerService.BACKUP_MANIFEST_FILENAME); + mManifestFile = new File(mDataDir, BackupManagerService.BACKUP_MANIFEST_FILENAME); } public void backupOnePackage() throws IOException { diff --git a/services/backup/java/com/android/server/backup/KeyValueBackupJob.java b/services/backup/java/com/android/server/backup/KeyValueBackupJob.java index 5dfb0bce863d..d8411e2a9ced 100644 --- a/services/backup/java/com/android/server/backup/KeyValueBackupJob.java +++ b/services/backup/java/com/android/server/backup/KeyValueBackupJob.java @@ -71,7 +71,7 @@ public class KeyValueBackupJob extends JobService { if (delay <= 0) { delay = interval + new Random().nextInt((int) fuzz); } - if (RefactoredBackupManagerService.DEBUG_SCHEDULING) { + if (BackupManagerService.DEBUG_SCHEDULING) { Slog.v(TAG, "Scheduling k/v pass in " + (delay / 1000 / 60) + " minutes"); } JobInfo.Builder builder = new JobInfo.Builder(JOB_ID, sKeyValueJobService) @@ -110,7 +110,7 @@ public class KeyValueBackupJob extends JobService { } // Time to run a key/value backup! - Trampoline service = RefactoredBackupManagerService.getInstance(); + Trampoline service = BackupManagerService.getInstance(); try { service.backupNow(); } catch (RemoteException e) {} diff --git a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java index e29b7d58e018..b5db5e2c5850 100644 --- a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java +++ b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java @@ -19,7 +19,6 @@ package com.android.server.backup; import android.util.Slog; import com.android.internal.annotations.GuardedBy; -import com.android.server.backup.RefactoredBackupManagerService; import java.io.BufferedInputStream; import java.io.DataInputStream; @@ -47,7 +46,7 @@ import java.util.Set; final class ProcessedPackagesJournal { private static final String TAG = "ProcessedPackagesJournal"; private static final String JOURNAL_FILE_NAME = "processed"; - private static final boolean DEBUG = RefactoredBackupManagerService.DEBUG || false; + private static final boolean DEBUG = BackupManagerService.DEBUG || false; // using HashSet instead of ArraySet since we expect 100-500 elements range @GuardedBy("mProcessedPackages") diff --git a/services/backup/java/com/android/server/backup/Trampoline.java b/services/backup/java/com/android/server/backup/Trampoline.java index 540f5a15e6f7..2abeaa693bec 100644 --- a/services/backup/java/com/android/server/backup/Trampoline.java +++ b/services/backup/java/com/android/server/backup/Trampoline.java @@ -100,8 +100,8 @@ public class Trampoline extends IBackupManager.Stub { BACKUP_SUPPRESS_FILENAME); } - protected BackupManagerServiceInterface createRefactoredBackupManagerService() { - return RefactoredBackupManagerService.create(mContext, this, mHandlerThread); + protected BackupManagerServiceInterface createBackupManagerService() { + return BackupManagerService.create(mContext, this, mHandlerThread); } // internal control API @@ -117,7 +117,7 @@ public class Trampoline extends IBackupManager.Stub { synchronized (this) { if (!mSuppressFile.exists()) { - mService = createRefactoredBackupManagerService(); + mService = createBackupManagerService(); } else { Slog.i(TAG, "Backup inactive in user " + whichUser); } @@ -162,7 +162,7 @@ public class Trampoline extends IBackupManager.Stub { Slog.i(TAG, "Making backup " + (makeActive ? "" : "in") + "active in user " + userHandle); if (makeActive) { - mService = createRefactoredBackupManagerService(); + mService = createBackupManagerService(); mSuppressFile.delete(); } else { mService = null; diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java index d460f4de4058..0582abac91d4 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java +++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java @@ -16,17 +16,17 @@ package com.android.server.backup.fullbackup; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_MANIFEST_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_METADATA_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_METADATA_VERSION; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_WIDGET_METADATA_TOKEN; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; -import static com.android.server.backup.RefactoredBackupManagerService +import static com.android.server.backup.BackupManagerService.BACKUP_MANIFEST_FILENAME; +import static com.android.server.backup.BackupManagerService.BACKUP_METADATA_FILENAME; +import static com.android.server.backup.BackupManagerService.BACKUP_METADATA_VERSION; +import static com.android.server.backup.BackupManagerService.BACKUP_WIDGET_METADATA_TOKEN; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP_WAIT; +import static com.android.server.backup.BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService .TIMEOUT_SHARED_BACKUP_INTERVAL; import android.app.ApplicationThreadConstants; @@ -46,7 +46,7 @@ import android.util.StringBuilderPrinter; import com.android.server.AppWidgetBackupBridge; import com.android.server.backup.BackupRestoreTask; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.utils.FullBackupUtils; import java.io.BufferedOutputStream; @@ -62,7 +62,7 @@ import java.io.OutputStream; */ public class FullBackupEngine { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; OutputStream mOutput; FullBackupPreflight mPreflightHook; BackupRestoreTask mTimeoutMonitor; @@ -163,7 +163,7 @@ public class FullBackupEngine { } } - public FullBackupEngine(RefactoredBackupManagerService backupManagerService, + public FullBackupEngine(BackupManagerService backupManagerService, OutputStream output, FullBackupPreflight preflightHook, PackageInfo pkg, boolean alsoApks, BackupRestoreTask timeoutMonitor, long quota, int opToken, diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java index da8a66a397f3..40b6967a729a 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java +++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java @@ -16,10 +16,10 @@ package com.android.server.backup.fullbackup; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP_WAIT; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; import android.app.backup.IBackupManager; import android.content.ComponentName; @@ -33,7 +33,7 @@ import android.os.UserHandle; import android.util.Slog; import com.android.internal.backup.IObbBackupService; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.utils.FullBackupUtils; import java.io.IOException; @@ -44,10 +44,10 @@ import java.io.OutputStream; */ public class FullBackupObbConnection implements ServiceConnection { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; volatile IObbBackupService mService; - public FullBackupObbConnection(RefactoredBackupManagerService backupManagerService) { + public FullBackupObbConnection(BackupManagerService backupManagerService) { this.backupManagerService = backupManagerService; mService = null; } diff --git a/services/backup/java/com/android/server/backup/fullbackup/FullBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/FullBackupTask.java index 37961f964d13..8f6923b6c05b 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupTask.java @@ -16,7 +16,7 @@ package com.android.server.backup.fullbackup; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.IFullBackupRestoreObserver; import android.os.RemoteException; diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java index 19e601be5f80..2e2d3eb4ad21 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java @@ -17,12 +17,12 @@ package com.android.server.backup.fullbackup; import static com.android.server.backup.BackupPasswordManager.PBKDF_CURRENT; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_FILE_HEADER_MAGIC; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_FILE_VERSION; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.BACKUP_FILE_HEADER_MAGIC; +import static com.android.server.backup.BackupManagerService.BACKUP_FILE_VERSION; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.IFullBackupRestoreObserver; import android.content.pm.ApplicationInfo; @@ -37,7 +37,7 @@ import android.util.Slog; import com.android.server.AppWidgetBackupBridge; import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.KeyValueAdbBackupEngine; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.utils.AppBackupUtils; import com.android.server.backup.utils.PasswordUtils; @@ -66,7 +66,7 @@ import javax.crypto.spec.SecretKeySpec; */ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestoreTask { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; FullBackupEngine mBackupEngine; final AtomicBoolean mLatch; @@ -86,7 +86,7 @@ public class PerformAdbBackupTask extends FullBackupTask implements BackupRestor String mEncryptPassword; private final int mCurrentOpToken; - public PerformAdbBackupTask(RefactoredBackupManagerService backupManagerService, + public PerformAdbBackupTask(BackupManagerService backupManagerService, ParcelFileDescriptor fd, IFullBackupRestoreObserver observer, boolean includeApks, boolean includeObbs, boolean includeShared, boolean doWidgets, String curPassword, String encryptPassword, boolean doAllApps, boolean doSystem, diff --git a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java index d04be1226e85..f9c366998ad2 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -16,13 +16,13 @@ package com.android.server.backup.fullbackup; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG_SCHEDULING; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_PENDING; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_PENDING; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP_WAIT; +import static com.android.server.backup.BackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; import android.annotation.Nullable; import android.app.IBackupAgent; @@ -46,7 +46,7 @@ import com.android.internal.backup.IBackupTransport; import com.android.server.EventLogTags; import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.FullBackupJob; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.TransportManager; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.internal.Operation; @@ -95,7 +95,7 @@ import java.util.concurrent.atomic.AtomicLong; */ public class PerformFullTransportBackupTask extends FullBackupTask implements BackupRestoreTask { public static PerformFullTransportBackupTask newWithCurrentTransport( - RefactoredBackupManagerService backupManagerService, + BackupManagerService backupManagerService, IFullBackupRestoreObserver observer, String[] whichPackages, boolean updateSchedule, @@ -126,7 +126,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba private static final String TAG = "PFTBT"; - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; private final Object mCancelLock = new Object(); ArrayList<PackageInfo> mPackages; @@ -147,7 +147,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba private volatile boolean mCancelAll; private final int mCurrentOpToken; - public PerformFullTransportBackupTask(RefactoredBackupManagerService backupManagerService, + public PerformFullTransportBackupTask(BackupManagerService backupManagerService, TransportClient transportClient, IFullBackupRestoreObserver observer, String[] whichPackages, boolean updateSchedule, 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 f29a9c2ecb6d..3df6e47a0244 100644 --- a/services/backup/java/com/android/server/backup/internal/BackupHandler.java +++ b/services/backup/java/com/android/server/backup/internal/BackupHandler.java @@ -16,12 +16,11 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_RESTORE_INTERVAL; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TIMEOUT_RESTORE_INTERVAL; -import android.app.AlarmManager; import android.app.backup.RestoreSet; import android.content.Intent; import android.os.Handler; @@ -35,9 +34,9 @@ import android.util.Slog; 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.RefactoredBackupManagerService; import com.android.server.backup.transport.TransportClient; import com.android.server.backup.TransportManager; import com.android.server.backup.fullbackup.PerformAdbBackupTask; @@ -81,10 +80,9 @@ public class BackupHandler extends Handler { public static final int MSG_BACKUP_RESTORE_STEP = 20; public static final int MSG_OP_COMPLETE = 21; - private final RefactoredBackupManagerService backupManagerService; + private final BackupManagerService backupManagerService; - public BackupHandler( - RefactoredBackupManagerService backupManagerService, Looper looper) { + public BackupHandler(BackupManagerService backupManagerService, Looper looper) { super(looper); this.backupManagerService = backupManagerService; } diff --git a/services/backup/java/com/android/server/backup/internal/ClearDataObserver.java b/services/backup/java/com/android/server/backup/internal/ClearDataObserver.java index d82c86541b8c..b0b8037dbc64 100644 --- a/services/backup/java/com/android/server/backup/internal/ClearDataObserver.java +++ b/services/backup/java/com/android/server/backup/internal/ClearDataObserver.java @@ -18,13 +18,13 @@ package com.android.server.backup.internal; import android.content.pm.IPackageDataObserver; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; public class ClearDataObserver extends IPackageDataObserver.Stub { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; - public ClearDataObserver(RefactoredBackupManagerService backupManagerService) { + public ClearDataObserver(BackupManagerService backupManagerService) { this.backupManagerService = backupManagerService; } diff --git a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java index bacb35791cea..0ba83cfeb361 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformBackupTask.java @@ -16,15 +16,15 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG_BACKUP_TRACE; -import static com.android.server.backup.RefactoredBackupManagerService.KEY_WIDGET_STATE; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_PENDING; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_BACKUP_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.PACKAGE_MANAGER_SENTINEL; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.DEBUG_BACKUP_TRACE; +import static com.android.server.backup.BackupManagerService.KEY_WIDGET_STATE; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_PENDING; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP; +import static com.android.server.backup.BackupManagerService.OP_TYPE_BACKUP_WAIT; +import static com.android.server.backup.BackupManagerService.PACKAGE_MANAGER_SENTINEL; +import static com.android.server.backup.BackupManagerService.TIMEOUT_BACKUP_INTERVAL; import static com.android.server.backup.internal.BackupHandler.MSG_BACKUP_OPERATION_TIMEOUT; import static com.android.server.backup.internal.BackupHandler.MSG_BACKUP_RESTORE_STEP; @@ -61,7 +61,7 @@ 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.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.fullbackup.PerformFullTransportBackupTask; import com.android.server.backup.transport.TransportClient; import com.android.server.backup.transport.TransportUtils; @@ -111,7 +111,7 @@ import java.util.concurrent.CountDownLatch; public class PerformBackupTask implements BackupRestoreTask { private static final String TAG = "PerformBackupTask"; - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; private final Object mCancelLock = new Object(); private ArrayList<BackupRequest> mQueue; @@ -145,7 +145,7 @@ public class PerformBackupTask implements BackupRestoreTask { private volatile boolean mCancelAll; - public PerformBackupTask(RefactoredBackupManagerService backupManagerService, + public PerformBackupTask(BackupManagerService backupManagerService, TransportClient transportClient, String dirName, ArrayList<BackupRequest> queue, @Nullable DataChangedJournal journal, IBackupObserver observer, IBackupManagerMonitor monitor, diff --git a/services/backup/java/com/android/server/backup/internal/PerformClearTask.java b/services/backup/java/com/android/server/backup/internal/PerformClearTask.java index 140d7286d556..d0281040452e 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformClearTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformClearTask.java @@ -16,26 +16,26 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TAG; import android.content.pm.PackageInfo; import android.util.Slog; import com.android.internal.backup.IBackupTransport; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.TransportManager; import com.android.server.backup.transport.TransportClient; import java.io.File; public class PerformClearTask implements Runnable { - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; private final TransportManager mTransportManager; private final TransportClient mTransportClient; private final PackageInfo mPackage; private final OnTaskFinishedListener mListener; - PerformClearTask(RefactoredBackupManagerService backupManagerService, + PerformClearTask(BackupManagerService backupManagerService, TransportClient transportClient, PackageInfo packageInfo, OnTaskFinishedListener listener) { mBackupManagerService = backupManagerService; diff --git a/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java b/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java index 2f2af98e68fa..88e0b7fc3045 100644 --- a/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java +++ b/services/backup/java/com/android/server/backup/internal/PerformInitializeTask.java @@ -16,7 +16,7 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TAG; import android.annotation.Nullable; import android.app.AlarmManager; @@ -30,7 +30,7 @@ import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.backup.IBackupTransport; import com.android.server.EventLogTags; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.TransportManager; import com.android.server.backup.transport.TransportClient; @@ -49,7 +49,7 @@ import java.util.List; * operation was successful then it's {@link BackupTransport#TRANSPORT_OK}. */ public class PerformInitializeTask implements Runnable { - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; private final TransportManager mTransportManager; private final String[] mQueue; private final File mBaseStateDir; @@ -57,7 +57,7 @@ public class PerformInitializeTask implements Runnable { @Nullable private IBackupObserver mObserver; public PerformInitializeTask( - RefactoredBackupManagerService backupManagerService, + BackupManagerService backupManagerService, String[] transportNames, @Nullable IBackupObserver observer, OnTaskFinishedListener listener) { @@ -72,7 +72,7 @@ public class PerformInitializeTask implements Runnable { @VisibleForTesting PerformInitializeTask( - RefactoredBackupManagerService backupManagerService, + BackupManagerService backupManagerService, TransportManager transportManager, String[] transportNames, @Nullable IBackupObserver observer, diff --git a/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java b/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java index 1001d3a2c8de..69720d4ee07c 100644 --- a/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java +++ b/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java @@ -16,22 +16,22 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.TAG; import android.database.ContentObserver; import android.os.Handler; import android.util.Slog; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.KeyValueBackupJob; -import com.android.server.backup.RefactoredBackupManagerService; public class ProvisionedObserver extends ContentObserver { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; public ProvisionedObserver( - RefactoredBackupManagerService backupManagerService, Handler handler) { + BackupManagerService backupManagerService, Handler handler) { super(handler); this.backupManagerService = backupManagerService; } diff --git a/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java b/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java index f1fa7eb5e5f6..6f574caabc23 100644 --- a/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java +++ b/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java @@ -16,10 +16,10 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.RUN_BACKUP_ACTION; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.RUN_BACKUP_ACTION; +import static com.android.server.backup.BackupManagerService.TAG; import static com.android.server.backup.internal.BackupHandler.MSG_RUN_BACKUP; import android.app.PendingIntent; @@ -29,13 +29,13 @@ import android.content.Intent; import android.os.Message; import android.util.Slog; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; public class RunBackupReceiver extends BroadcastReceiver { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; - public RunBackupReceiver(RefactoredBackupManagerService backupManagerService) { + public RunBackupReceiver(BackupManagerService backupManagerService) { this.backupManagerService = backupManagerService; } diff --git a/services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java b/services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java index 6c160a332096..548c580f78fb 100644 --- a/services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java +++ b/services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java @@ -16,9 +16,9 @@ package com.android.server.backup.internal; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.RUN_INITIALIZE_ACTION; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.RUN_INITIALIZE_ACTION; +import static com.android.server.backup.BackupManagerService.TAG; import android.content.BroadcastReceiver; import android.content.Context; @@ -27,12 +27,12 @@ import android.os.PowerManager; import android.util.ArraySet; import android.util.Slog; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; public class RunInitializeReceiver extends BroadcastReceiver { - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; - public RunInitializeReceiver(RefactoredBackupManagerService backupManagerService) { + public RunInitializeReceiver(BackupManagerService backupManagerService) { mBackupManagerService = backupManagerService; } diff --git a/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java b/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java index 82106ec51ab8..238f7a05877d 100644 --- a/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java +++ b/services/backup/java/com/android/server/backup/restore/ActiveRestoreSession.java @@ -16,8 +16,8 @@ package com.android.server.backup.restore; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; import static com.android.server.backup.internal.BackupHandler.MSG_RESTORE_SESSION_TIMEOUT; import static com.android.server.backup.internal.BackupHandler.MSG_RUN_GET_RESTORE_SETS; import static com.android.server.backup.internal.BackupHandler.MSG_RUN_RESTORE; @@ -35,9 +35,8 @@ import android.os.Message; import android.os.PowerManager; import android.util.Slog; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.TransportManager; -import com.android.server.backup.internal.BackupHandler; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.params.RestoreGetSetsParams; import com.android.server.backup.params.RestoreParams; @@ -53,13 +52,13 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { private final TransportManager mTransportManager; private final String mTransportName; - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; private final String mPackageName; public RestoreSet[] mRestoreSets = null; boolean mEnded = false; boolean mTimedOut = false; - public ActiveRestoreSession(RefactoredBackupManagerService backupManagerService, + public ActiveRestoreSession(BackupManagerService backupManagerService, String packageName, String transportName) { mBackupManagerService = backupManagerService; mPackageName = packageName; @@ -399,11 +398,10 @@ public class ActiveRestoreSession extends IRestoreSession.Stub { // Posted to the handler to tear down a restore session in a cleanly synchronized way public class EndRestoreRunnable implements Runnable { - RefactoredBackupManagerService mBackupManager; + BackupManagerService mBackupManager; ActiveRestoreSession mSession; - public EndRestoreRunnable(RefactoredBackupManagerService manager, - ActiveRestoreSession session) { + public EndRestoreRunnable(BackupManagerService manager, ActiveRestoreSession session) { mBackupManager = manager; mSession = session; } diff --git a/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java b/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java index 6353d1f5fd13..e4f3a9d5cd0a 100644 --- a/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java +++ b/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java @@ -16,14 +16,14 @@ package com.android.server.backup.restore; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; import android.util.Slog; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.BackupRestoreTask; -import com.android.server.backup.RefactoredBackupManagerService; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; @@ -34,11 +34,11 @@ import java.util.concurrent.TimeUnit; public class AdbRestoreFinishedLatch implements BackupRestoreTask { private static final String TAG = "AdbRestoreFinishedLatch"; - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; final CountDownLatch mLatch; private final int mCurrentOpToken; - public AdbRestoreFinishedLatch(RefactoredBackupManagerService backupManagerService, + public AdbRestoreFinishedLatch(BackupManagerService backupManagerService, int currentOpToken) { this.backupManagerService = backupManagerService; mLatch = new CountDownLatch(1); diff --git a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java index 2c8b5b4c612c..0ca4f25093ce 100644 --- a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java +++ b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java @@ -16,15 +16,15 @@ package com.android.server.backup.restore; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_MANIFEST_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_METADATA_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_RESTORE_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_RESTORE_INTERVAL; -import static com.android.server.backup.RefactoredBackupManagerService +import static com.android.server.backup.BackupManagerService.BACKUP_MANIFEST_FILENAME; +import static com.android.server.backup.BackupManagerService.BACKUP_METADATA_FILENAME; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_TYPE_RESTORE_WAIT; +import static com.android.server.backup.BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TIMEOUT_RESTORE_INTERVAL; +import static com.android.server.backup.BackupManagerService .TIMEOUT_SHARED_BACKUP_INTERVAL; import static com.android.server.backup.internal.BackupHandler.MSG_RESTORE_OPERATION_TIMEOUT; @@ -44,7 +44,7 @@ import android.util.Slog; import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.FileMetadata; import com.android.server.backup.KeyValueAdbRestoreEngine; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.fullbackup.FullBackupObbConnection; import com.android.server.backup.utils.BytesReadListener; import com.android.server.backup.utils.FullBackupRestoreObserverUtils; @@ -62,7 +62,7 @@ import java.util.HashSet; */ public class FullRestoreEngine extends RestoreEngine { - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; // Task in charge of monitoring timeouts private final BackupRestoreTask mMonitorTask; @@ -119,7 +119,7 @@ public class FullRestoreEngine extends RestoreEngine { final int mEphemeralOpToken; - public FullRestoreEngine(RefactoredBackupManagerService backupManagerService, + public FullRestoreEngine(BackupManagerService backupManagerService, BackupRestoreTask monitorTask, IFullBackupRestoreObserver observer, IBackupManagerMonitor monitor, PackageInfo onlyPackage, boolean allowApks, boolean allowObbs, int ephemeralOpToken) { diff --git a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java index 54c27460790d..e576b3c32859 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java @@ -18,18 +18,18 @@ package com.android.server.backup.restore; import static com.android.server.backup.BackupPasswordManager.PBKDF_CURRENT; import static com.android.server.backup.BackupPasswordManager.PBKDF_FALLBACK; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_FILE_HEADER_MAGIC; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_FILE_VERSION; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_MANIFEST_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_METADATA_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_RESTORE_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.SETTINGS_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_RESTORE_INTERVAL; +import static com.android.server.backup.BackupManagerService.BACKUP_FILE_HEADER_MAGIC; +import static com.android.server.backup.BackupManagerService.BACKUP_FILE_VERSION; +import static com.android.server.backup.BackupManagerService.BACKUP_MANIFEST_FILENAME; +import static com.android.server.backup.BackupManagerService.BACKUP_METADATA_FILENAME; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_TYPE_RESTORE_WAIT; +import static com.android.server.backup.BackupManagerService.SETTINGS_PACKAGE; +import static com.android.server.backup.BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TIMEOUT_FULL_BACKUP_INTERVAL; +import static com.android.server.backup.BackupManagerService.TIMEOUT_RESTORE_INTERVAL; import static com.android.server.backup.internal.BackupHandler.MSG_RESTORE_OPERATION_TIMEOUT; import android.app.ApplicationThreadConstants; @@ -47,10 +47,10 @@ import android.os.RemoteException; import android.util.Slog; import com.android.internal.annotations.VisibleForTesting; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.FileMetadata; import com.android.server.backup.KeyValueAdbRestoreEngine; import com.android.server.backup.PackageManagerBackupAgent; -import com.android.server.backup.RefactoredBackupManagerService; import com.android.server.backup.fullbackup.FullBackupObbConnection; import com.android.server.backup.utils.BytesReadListener; import com.android.server.backup.utils.FullBackupRestoreObserverUtils; @@ -82,7 +82,7 @@ import javax.crypto.spec.SecretKeySpec; public class PerformAdbRestoreTask implements Runnable { - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; private final ParcelFileDescriptor mInputFile; private final String mCurrentPassword; private final String mDecryptPassword; @@ -106,10 +106,10 @@ public class PerformAdbRestoreTask implements Runnable { private final IBackupAgent mAgent; private final int mToken; - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; RestoreFinishedRunnable(IBackupAgent agent, int token, - RefactoredBackupManagerService backupManagerService) { + BackupManagerService backupManagerService) { mAgent = agent; mToken = token; mBackupManagerService = backupManagerService; @@ -139,7 +139,7 @@ public class PerformAdbRestoreTask implements Runnable { // Packages we've already wiped data on when restoring their first file private final HashSet<String> mClearedPackages = new HashSet<>(); - public PerformAdbRestoreTask(RefactoredBackupManagerService backupManagerService, + public PerformAdbRestoreTask(BackupManagerService backupManagerService, ParcelFileDescriptor fd, String curPassword, String decryptPassword, IFullBackupRestoreObserver observer, AtomicBoolean latch) { this.mBackupManagerService = backupManagerService; diff --git a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java index 88f9eadea6d3..6eb9619b8844 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -16,16 +16,16 @@ package com.android.server.backup.restore; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.KEY_WIDGET_STATE; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.OP_TYPE_RESTORE_WAIT; -import static com.android.server.backup.RefactoredBackupManagerService.PACKAGE_MANAGER_SENTINEL; -import static com.android.server.backup.RefactoredBackupManagerService.SETTINGS_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; -import static com.android.server.backup.RefactoredBackupManagerService +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.KEY_WIDGET_STATE; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.OP_TYPE_RESTORE_WAIT; +import static com.android.server.backup.BackupManagerService.PACKAGE_MANAGER_SENTINEL; +import static com.android.server.backup.BackupManagerService.SETTINGS_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService .TIMEOUT_RESTORE_FINISHED_INTERVAL; -import static com.android.server.backup.RefactoredBackupManagerService.TIMEOUT_RESTORE_INTERVAL; +import static com.android.server.backup.BackupManagerService.TIMEOUT_RESTORE_INTERVAL; import static com.android.server.backup.internal.BackupHandler.MSG_BACKUP_RESTORE_STEP; import static com.android.server.backup.internal.BackupHandler.MSG_RESTORE_OPERATION_TIMEOUT; import static com.android.server.backup.internal.BackupHandler.MSG_RESTORE_SESSION_TIMEOUT; @@ -60,7 +60,7 @@ import com.android.server.backup.BackupRestoreTask; import com.android.server.backup.BackupUtils; import com.android.server.backup.PackageManagerBackupAgent; import com.android.server.backup.PackageManagerBackupAgent.Metadata; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.TransportManager; import com.android.server.backup.internal.OnTaskFinishedListener; import com.android.server.backup.transport.TransportClient; @@ -78,7 +78,7 @@ import java.util.List; public class PerformUnifiedRestoreTask implements BackupRestoreTask { - private RefactoredBackupManagerService backupManagerService; + private BackupManagerService backupManagerService; private final TransportManager mTransportManager; // Transport client we're working with to do the restore private final TransportClient mTransportClient; @@ -160,7 +160,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // Invariant: mWakelock is already held, and this task is responsible for // releasing it at the end of the restore operation. - public PerformUnifiedRestoreTask(RefactoredBackupManagerService backupManagerService, + public PerformUnifiedRestoreTask(BackupManagerService backupManagerService, TransportClient transportClient, IRestoreObserver observer, IBackupManagerMonitor monitor, long restoreSetToken, PackageInfo targetPackage, int pmToken, boolean isFullSystemRestore, String[] filterSet, diff --git a/services/backup/java/com/android/server/backup/restore/RestoreFileRunnable.java b/services/backup/java/com/android/server/backup/restore/RestoreFileRunnable.java index 6c9a22202906..635b6d6bd431 100644 --- a/services/backup/java/com/android/server/backup/restore/RestoreFileRunnable.java +++ b/services/backup/java/com/android/server/backup/restore/RestoreFileRunnable.java @@ -21,7 +21,7 @@ import android.os.ParcelFileDescriptor; import android.os.RemoteException; import com.android.server.backup.FileMetadata; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import java.io.IOException; @@ -35,9 +35,9 @@ class RestoreFileRunnable implements Runnable { private final FileMetadata mInfo; private final ParcelFileDescriptor mSocket; private final int mToken; - private final RefactoredBackupManagerService mBackupManagerService; + private final BackupManagerService mBackupManagerService; - RestoreFileRunnable(RefactoredBackupManagerService backupManagerService, IBackupAgent agent, + RestoreFileRunnable(BackupManagerService backupManagerService, IBackupAgent agent, FileMetadata info, ParcelFileDescriptor socket, int token) throws IOException { mAgent = agent; mInfo = info; diff --git a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java index dbf1a82691f1..6780563120e3 100644 --- a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java +++ b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java @@ -16,9 +16,9 @@ package com.android.server.backup.utils; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; import android.annotation.Nullable; import android.app.backup.BackupTransport; diff --git a/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorUtils.java b/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorUtils.java index 010684e86b55..b23781d37569 100644 --- a/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorUtils.java +++ b/services/backup/java/com/android/server/backup/utils/BackupManagerMonitorUtils.java @@ -18,8 +18,8 @@ package com.android.server.backup.utils; import static android.app.backup.BackupManagerMonitor.EXTRA_LOG_EVENT_PACKAGE_NAME; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.BackupManagerMonitor; import android.app.backup.IBackupManagerMonitor; diff --git a/services/backup/java/com/android/server/backup/utils/BackupObserverUtils.java b/services/backup/java/com/android/server/backup/utils/BackupObserverUtils.java index 3be1e338bb1e..c0cf2ef86920 100644 --- a/services/backup/java/com/android/server/backup/utils/BackupObserverUtils.java +++ b/services/backup/java/com/android/server/backup/utils/BackupObserverUtils.java @@ -16,8 +16,8 @@ package com.android.server.backup.utils; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.BackupProgress; import android.app.backup.IBackupObserver; diff --git a/services/backup/java/com/android/server/backup/utils/FullBackupRestoreObserverUtils.java b/services/backup/java/com/android/server/backup/utils/FullBackupRestoreObserverUtils.java index 089109e697d3..fa856ce2c6de 100644 --- a/services/backup/java/com/android/server/backup/utils/FullBackupRestoreObserverUtils.java +++ b/services/backup/java/com/android/server/backup/utils/FullBackupRestoreObserverUtils.java @@ -16,7 +16,7 @@ package com.android.server.backup.utils; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.IFullBackupRestoreObserver; import android.os.RemoteException; diff --git a/services/backup/java/com/android/server/backup/utils/FullBackupUtils.java b/services/backup/java/com/android/server/backup/utils/FullBackupUtils.java index a731fc9a0932..d2ab09996d68 100644 --- a/services/backup/java/com/android/server/backup/utils/FullBackupUtils.java +++ b/services/backup/java/com/android/server/backup/utils/FullBackupUtils.java @@ -16,8 +16,8 @@ package com.android.server.backup.utils; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_MANIFEST_VERSION; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.BACKUP_MANIFEST_VERSION; +import static com.android.server.backup.BackupManagerService.TAG; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; diff --git a/services/backup/java/com/android/server/backup/utils/PasswordUtils.java b/services/backup/java/com/android/server/backup/utils/PasswordUtils.java index 9c5e28393a53..a7eb644713ba 100644 --- a/services/backup/java/com/android/server/backup/utils/PasswordUtils.java +++ b/services/backup/java/com/android/server/backup/utils/PasswordUtils.java @@ -16,7 +16,7 @@ package com.android.server.backup.utils; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.TAG; import android.util.Slog; diff --git a/services/backup/java/com/android/server/backup/utils/RestoreUtils.java b/services/backup/java/com/android/server/backup/utils/RestoreUtils.java index 632f5b53c146..10f06954f17f 100644 --- a/services/backup/java/com/android/server/backup/utils/RestoreUtils.java +++ b/services/backup/java/com/android/server/backup/utils/RestoreUtils.java @@ -16,8 +16,8 @@ package com.android.server.backup.utils; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.TAG; import android.content.Context; import android.content.IIntentReceiver; diff --git a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java index ff9cb5696c77..cc26ff8b5090 100644 --- a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java +++ b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java @@ -34,14 +34,14 @@ import static android.app.backup.BackupManagerMonitor.LOG_EVENT_ID_SYSTEM_APP_NO import static android.app.backup.BackupManagerMonitor.LOG_EVENT_ID_VERSIONS_MATCH; import static android.app.backup.BackupManagerMonitor.LOG_EVENT_ID_VERSION_OF_BACKUP_OLDER; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_MANIFEST_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_MANIFEST_VERSION; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_METADATA_FILENAME; -import static com.android.server.backup.RefactoredBackupManagerService.BACKUP_WIDGET_METADATA_TOKEN; -import static com.android.server.backup.RefactoredBackupManagerService.DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.MORE_DEBUG; -import static com.android.server.backup.RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; -import static com.android.server.backup.RefactoredBackupManagerService.TAG; +import static com.android.server.backup.BackupManagerService.BACKUP_MANIFEST_FILENAME; +import static com.android.server.backup.BackupManagerService.BACKUP_MANIFEST_VERSION; +import static com.android.server.backup.BackupManagerService.BACKUP_METADATA_FILENAME; +import static com.android.server.backup.BackupManagerService.BACKUP_WIDGET_METADATA_TOKEN; +import static com.android.server.backup.BackupManagerService.DEBUG; +import static com.android.server.backup.BackupManagerService.MORE_DEBUG; +import static com.android.server.backup.BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; +import static com.android.server.backup.BackupManagerService.TAG; import android.app.backup.BackupAgent; import android.app.backup.BackupManagerMonitor; diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java index 94a356e65878..f95c6f042fed 100644 --- a/services/java/com/android/server/SystemServer.java +++ b/services/java/com/android/server/SystemServer.java @@ -160,7 +160,7 @@ public final class SystemServer { * them from the build system somehow. */ private static final String BACKUP_MANAGER_SERVICE_CLASS = - "com.android.server.backup.RefactoredBackupManagerService$Lifecycle"; + "com.android.server.backup.BackupManagerService$Lifecycle"; private static final String APPWIDGET_SERVICE_CLASS = "com.android.server.appwidget.AppWidgetService"; private static final String VOICE_RECOGNITION_MANAGER_SERVICE_CLASS = diff --git a/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java b/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java index e072800e5116..b60ad4b3f815 100644 --- a/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java +++ b/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java @@ -41,6 +41,7 @@ import android.content.Intent; import android.os.HandlerThread; import android.platform.test.annotations.Presubmit; import android.provider.Settings; +import com.android.server.backup.PackageManagerBackupAgent; import com.android.server.backup.testing.ShadowAppBackupUtils; import com.android.server.backup.testing.ShadowBackupPolicyEnforcer; import com.android.server.backup.testing.TransportData; @@ -73,7 +74,11 @@ import org.robolectric.shadows.ShadowSystemClock; sdk = 26, shadows = {ShadowAppBackupUtils.class, ShadowBackupPolicyEnforcer.class} ) -@SystemLoaderClasses({RefactoredBackupManagerService.class, TransportManager.class}) +@SystemLoaderClasses({ + BackupManagerService.class, + TransportManager.class, + PackageManagerBackupAgent.class +}) @Presubmit public class BackupManagerServiceTest { private static final String TAG = "BMSTest"; @@ -126,8 +131,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); when(mTransportManager.getTransportCurrentDestinationString(eq(mTransportName))) .thenReturn("destinationString"); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); String destination = backupManagerService.getDestinationString(mTransportName); @@ -139,8 +143,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); when(mTransportManager.getTransportCurrentDestinationString(eq(mTransportName))) .thenThrow(TransportNotRegisteredException.class); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); String destination = backupManagerService.getDestinationString(mTransportName); @@ -152,8 +155,7 @@ public class BackupManagerServiceTest { mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); when(mTransportManager.getTransportCurrentDestinationString(eq(mTransportName))) .thenThrow(TransportNotRegisteredException.class); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( SecurityException.class, @@ -167,8 +169,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); TransportMock transportMock = setUpCurrentTransport(mTransportManager, backupTransport()); ShadowAppBackupUtils.sAppIsRunningAndEligibleForBackupWithTransport = p -> true; - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); boolean result = backupManagerService.isAppEligibleForBackup("app.package"); @@ -183,8 +184,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); setUpCurrentTransport(mTransportManager, mTransport); ShadowAppBackupUtils.sAppIsRunningAndEligibleForBackupWithTransport = p -> false; - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); boolean result = backupManagerService.isAppEligibleForBackup("app.package"); @@ -195,8 +195,7 @@ public class BackupManagerServiceTest { public void testIsAppEligibleForBackup_withoutPermission() throws Exception { mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); setUpCurrentTransport(mTransportManager, mTransport); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( SecurityException.class, @@ -211,8 +210,7 @@ public class BackupManagerServiceTest { packagesMap.put("package.a", true); packagesMap.put("package.b", false); ShadowAppBackupUtils.sAppIsRunningAndEligibleForBackupWithTransport = packagesMap::get; - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); String[] packages = packagesMap.keySet().toArray(new String[packagesMap.size()]); String[] filtered = backupManagerService.filterAppsEligibleForBackup(packages); @@ -226,8 +224,7 @@ public class BackupManagerServiceTest { public void testFilterAppsEligibleForBackup_whenNoneIsEligible() throws Exception { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); ShadowAppBackupUtils.sAppIsRunningAndEligibleForBackupWithTransport = p -> false; - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); String[] filtered = backupManagerService.filterAppsEligibleForBackup( @@ -240,8 +237,7 @@ public class BackupManagerServiceTest { public void testFilterAppsEligibleForBackup_withoutPermission() throws Exception { mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); setUpCurrentTransport(mTransportManager, mTransport); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( SecurityException.class, @@ -276,8 +272,7 @@ public class BackupManagerServiceTest { public void testSelectBackupTransport() throws Exception { setUpForSelectTransport(); mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); String oldTransport = backupManagerService.selectBackupTransport(mNewTransport.transportName); @@ -292,8 +287,7 @@ public class BackupManagerServiceTest { public void testSelectBackupTransport_withoutPermission() throws Exception { setUpForSelectTransport(); mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( SecurityException.class, @@ -306,8 +300,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); when(mTransportManager.registerAndSelectTransport(eq(mNewTransportComponent))) .thenReturn(BackupManager.SUCCESS); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); ISelectBackupTransportCallback callback = mock(ISelectBackupTransportCallback.class); backupManagerService.selectBackupTransportAsync(mNewTransportComponent, callback); @@ -327,8 +320,7 @@ public class BackupManagerServiceTest { when(mTransportManager.registerAndSelectTransport(eq(mNewTransportComponent))) .thenReturn(BackupManager.SUCCESS); ISelectBackupTransportCallback callback = mock(ISelectBackupTransportCallback.class); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); backupManagerService.selectBackupTransportAsync(mNewTransportComponent, callback); @@ -347,8 +339,7 @@ public class BackupManagerServiceTest { when(mTransportManager.registerAndSelectTransport(eq(mNewTransportComponent))) .thenReturn(BackupManager.SUCCESS); ISelectBackupTransportCallback callback = mock(ISelectBackupTransportCallback.class); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); backupManagerService.selectBackupTransportAsync(mNewTransportComponent, callback); @@ -363,8 +354,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); when(mTransportManager.registerAndSelectTransport(eq(mNewTransportComponent))) .thenReturn(BackupManager.ERROR_TRANSPORT_UNAVAILABLE); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); ISelectBackupTransportCallback callback = mock(ISelectBackupTransportCallback.class); backupManagerService.selectBackupTransportAsync(mNewTransportComponent, callback); @@ -381,8 +371,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); when(mTransportManager.registerAndSelectTransport(eq(newTransportComponent))) .thenReturn(BackupManager.SUCCESS); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); ISelectBackupTransportCallback callback = mock(ISelectBackupTransportCallback.class); backupManagerService.selectBackupTransportAsync(newTransportComponent, callback); @@ -396,8 +385,7 @@ public class BackupManagerServiceTest { public void testSelectBackupTransportAsync_withoutPermission() throws Exception { setUpForSelectTransport(); mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); ComponentName newTransportComponent = mNewTransport.getTransportComponent(); expectThrows( @@ -437,8 +425,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); Intent configurationIntent = new Intent(); Intent dataManagementIntent = new Intent(); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); backupManagerService.updateTransportAttributes( mTransportUid, @@ -464,8 +451,7 @@ public class BackupManagerServiceTest { throws Exception { setUpForUpdateTransportAttributes(); mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( SecurityException.class, @@ -485,8 +471,7 @@ public class BackupManagerServiceTest { throws Exception { setUpForUpdateTransportAttributes(); mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( RuntimeException.class, @@ -505,8 +490,7 @@ public class BackupManagerServiceTest { public void testUpdateTransportAttributes_whenNameNull_throwsException() throws Exception { setUpForUpdateTransportAttributes(); mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( RuntimeException.class, @@ -526,8 +510,7 @@ public class BackupManagerServiceTest { throws Exception { setUpForUpdateTransportAttributes(); mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( RuntimeException.class, @@ -548,8 +531,7 @@ public class BackupManagerServiceTest { throws Exception { setUpForUpdateTransportAttributes(); mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( RuntimeException.class, @@ -583,8 +565,7 @@ public class BackupManagerServiceTest { mShadowContext.grantPermissions(android.Manifest.permission.BACKUP); Intent configurationIntent = new Intent(); Intent dataManagementIntent = new Intent(); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); backupManagerService.updateTransportAttributes( mTransportUid, @@ -610,8 +591,7 @@ public class BackupManagerServiceTest { throws Exception { setUpForUpdateTransportAttributes(); mShadowContext.denyPermissions(android.Manifest.permission.BACKUP); - RefactoredBackupManagerService backupManagerService = - createInitializedBackupManagerService(); + BackupManagerService backupManagerService = createInitializedBackupManagerService(); expectThrows( SecurityException.class, @@ -648,8 +628,8 @@ public class BackupManagerServiceTest { verify(mTransportManager, never()).registerTransports(); } - private RefactoredBackupManagerService createBackupManagerService() { - return new RefactoredBackupManagerService( + private BackupManagerService createBackupManagerService() { + return new BackupManagerService( mContext, new Trampoline(mContext), mBackupThread, @@ -658,9 +638,9 @@ public class BackupManagerServiceTest { mTransportManager); } - private RefactoredBackupManagerService createInitializedBackupManagerService() { - RefactoredBackupManagerService backupManagerService = - new RefactoredBackupManagerService( + private BackupManagerService createInitializedBackupManagerService() { + BackupManagerService backupManagerService = + new BackupManagerService( mContext, new Trampoline(mContext), mBackupThread, diff --git a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java index 3668350c6616..1360828bc81c 100644 --- a/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java +++ b/services/robotests/src/com/android/server/backup/PerformBackupTaskTest.java @@ -103,6 +103,7 @@ import java.util.stream.Stream; } ) @SystemLoaderClasses({ + BackupManagerService.class, PerformBackupTask.class, BackupDataOutput.class, FullBackupDataOutput.class, @@ -117,7 +118,7 @@ public class PerformBackupTaskTest { private static final String PACKAGE_1 = "com.example.package1"; private static final String PACKAGE_2 = "com.example.package2"; - @Mock private RefactoredBackupManagerService mBackupManagerService; + @Mock private BackupManagerService mBackupManagerService; @Mock private TransportManager mTransportManager; @Mock private DataChangedJournal mDataChangedJournal; @Mock private IBackupObserver mObserver; diff --git a/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java b/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java index ace0441c8a4a..55fb46068eeb 100644 --- a/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java +++ b/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java @@ -42,7 +42,7 @@ import android.os.DeadObjectException; import android.platform.test.annotations.Presubmit; import com.android.internal.backup.IBackupTransport; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.TransportManager; import com.android.server.backup.testing.TransportTestUtils; import com.android.server.backup.testing.TransportData; @@ -67,10 +67,14 @@ import java.util.stream.Stream; @RunWith(FrameworkRobolectricTestRunner.class) @Config(manifest = Config.NONE, sdk = 26) -@SystemLoaderClasses({PerformInitializeTaskTest.class, TransportManager.class}) +@SystemLoaderClasses({ + BackupManagerService.class, + PerformInitializeTaskTest.class, + TransportManager.class +}) @Presubmit public class PerformInitializeTaskTest { - @Mock private RefactoredBackupManagerService mBackupManagerService; + @Mock private BackupManagerService mBackupManagerService; @Mock private TransportManager mTransportManager; @Mock private OnTaskFinishedListener mListener; @Mock private IBackupTransport mTransportBinder; diff --git a/services/robotests/src/com/android/server/backup/testing/ShadowBackupPolicyEnforcer.java b/services/robotests/src/com/android/server/backup/testing/ShadowBackupPolicyEnforcer.java index 88b30da46433..ef4764d394de 100644 --- a/services/robotests/src/com/android/server/backup/testing/ShadowBackupPolicyEnforcer.java +++ b/services/robotests/src/com/android/server/backup/testing/ShadowBackupPolicyEnforcer.java @@ -3,7 +3,6 @@ package com.android.server.backup.testing; import android.content.ComponentName; import com.android.server.backup.BackupPolicyEnforcer; -import com.android.server.backup.RefactoredBackupManagerService; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; diff --git a/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java b/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java index 5786095720a7..bbd999bdc466 100644 --- a/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java @@ -82,7 +82,7 @@ public class TrampolineTest { }; private final int NON_USER_SYSTEM = UserHandle.USER_SYSTEM + 1; - @Mock private RefactoredBackupManagerService mBackupManagerServiceMock; + @Mock private BackupManagerService mBackupManagerServiceMock; @Mock private Context mContextMock; @Mock private File mSuppressFileMock; @Mock private File mSuppressFileParentMock; @@ -101,7 +101,7 @@ public class TrampolineTest { public void setUp() { MockitoAnnotations.initMocks(this); - TrampolineTestable.sRefactoredBackupManagerServiceMock = mBackupManagerServiceMock; + TrampolineTestable.sBackupManagerServiceMock = mBackupManagerServiceMock; TrampolineTestable.sSuppressFile = mSuppressFileMock; TrampolineTestable.sCallingUid = Process.SYSTEM_UID; TrampolineTestable.sBackupDisabled = false; @@ -863,7 +863,7 @@ public class TrampolineTest { static boolean sBackupDisabled = false; static File sSuppressFile = null; static int sCallingUid = -1; - static RefactoredBackupManagerService sRefactoredBackupManagerServiceMock = null; + static BackupManagerService sBackupManagerServiceMock = null; private int mCreateServiceCallsCount = 0; TrampolineTestable(Context context) { @@ -886,9 +886,9 @@ public class TrampolineTest { } @Override - protected BackupManagerServiceInterface createRefactoredBackupManagerService() { + protected BackupManagerServiceInterface createBackupManagerService() { mCreateServiceCallsCount++; - return sRefactoredBackupManagerServiceMock; + return sBackupManagerServiceMock; } int getCreateServiceCallsCount() { diff --git a/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java b/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java index ed26296ba72a..86c83d6707b6 100644 --- a/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/utils/AppBackupUtilsTest.java @@ -27,7 +27,7 @@ import android.platform.test.annotations.Presubmit; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.testutils.PackageManagerStub; import org.junit.Test; @@ -82,7 +82,7 @@ public class AppBackupUtilsTest { applicationInfo.flags |= ApplicationInfo.FLAG_ALLOW_BACKUP; applicationInfo.uid = Process.SYSTEM_UID; applicationInfo.backupAgentName = CUSTOM_BACKUP_AGENT_NAME; - applicationInfo.packageName = RefactoredBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; + applicationInfo.packageName = BackupManagerService.SHARED_BACKUP_AGENT_PACKAGE; boolean isEligible = AppBackupUtils.appIsEligibleForBackup(applicationInfo, mPackageManagerStub); diff --git a/services/tests/servicestests/src/com/android/server/backup/utils/TarBackupReaderTest.java b/services/tests/servicestests/src/com/android/server/backup/utils/TarBackupReaderTest.java index 6b25d1225c6e..0cdf04bda2d0 100644 --- a/services/tests/servicestests/src/com/android/server/backup/utils/TarBackupReaderTest.java +++ b/services/tests/servicestests/src/com/android/server/backup/utils/TarBackupReaderTest.java @@ -47,7 +47,7 @@ import android.support.test.runner.AndroidJUnit4; import com.android.frameworks.servicestests.R; import com.android.server.backup.FileMetadata; -import com.android.server.backup.RefactoredBackupManagerService; +import com.android.server.backup.BackupManagerService; import com.android.server.backup.restore.PerformAdbRestoreTask; import com.android.server.backup.restore.RestorePolicy; import com.android.server.backup.testutils.PackageManagerStub; @@ -143,8 +143,7 @@ public class TarBackupReaderTest { assertThat(restorePolicy).isEqualTo(RestorePolicy.IGNORE); assertThat(fileMetadata.packageName).isEqualTo(TEST_PACKAGE_NAME); - assertThat(fileMetadata.path).isEqualTo( - RefactoredBackupManagerService.BACKUP_MANIFEST_FILENAME); + assertThat(fileMetadata.path).isEqualTo(BackupManagerService.BACKUP_MANIFEST_FILENAME); tarBackupReader.skipTarPadding(fileMetadata.size); |