[Multi-user] Rename GlobalBackupManagerService -> BackupManagerService
Restore original naming since UserBackupManagerService is now merged.
Just find and replace, no functionality changes in this CL.
Bug: 118520567
Test: 1) atest RunFrameworksServicesRoboTests
2) atest $(find \
frameworks/base/services/tests/servicestests/src/com/android/server/backup \
-name '*Test.java')
3) adb shell bmgr flows
Change-Id: Ia37997cec93fac9ebb5102edfff9000c9cff4eb1
diff --git a/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java b/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
index ab639c3..2bca34d 100644
--- a/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
+++ b/services/backup/java/com/android/server/backup/BackupAgentTimeoutParameters.java
@@ -16,7 +16,7 @@
package com.android.server.backup;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;
+import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING;
import android.content.ContentResolver;
import android.os.Handler;
diff --git a/services/backup/java/com/android/server/backup/BackupManagerConstants.java b/services/backup/java/com/android/server/backup/BackupManagerConstants.java
index e3fa0dc..785d3ca 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerConstants.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerConstants.java
@@ -16,7 +16,7 @@
package com.android.server.backup;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;
+import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING;
import android.app.AlarmManager;
import android.content.ContentResolver;
diff --git a/services/backup/java/com/android/server/backup/GlobalBackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
similarity index 98%
rename from services/backup/java/com/android/server/backup/GlobalBackupManagerService.java
rename to services/backup/java/com/android/server/backup/BackupManagerService.java
index 9a1662e..0b06f28 100644
--- a/services/backup/java/com/android/server/backup/GlobalBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -62,7 +62,7 @@
* incoming calls to the appropriate per-user {@link UserBackupManagerService} to handle the
* corresponding backup/restore operation.
*/
-public class GlobalBackupManagerService {
+public class BackupManagerService {
public static final String TAG = "BackupManagerService";
public static final boolean DEBUG = true;
public static final boolean MORE_DEBUG = false;
@@ -82,8 +82,8 @@
return sInstance;
}
- /** Helper to create the {@link GlobalBackupManagerService} instance. */
- public static GlobalBackupManagerService create(
+ /** Helper to create the {@link BackupManagerService} instance. */
+ public static BackupManagerService create(
Context context,
Trampoline parent,
HandlerThread backupThread) {
@@ -116,7 +116,7 @@
// This dir on /cache is managed directly in init.rc
File dataDir = new File(Environment.getDownloadCacheDirectory(), "backup_stage");
- return new GlobalBackupManagerService(
+ return new BackupManagerService(
context,
parent,
backupThread,
@@ -127,8 +127,8 @@
private UserBackupManagerService mUserBackupManagerService;
- /** Instantiate a new instance of {@link GlobalBackupManagerService}. */
- public GlobalBackupManagerService(
+ /** Instantiate a new instance of {@link BackupManagerService}. */
+ public BackupManagerService(
Context context,
Trampoline trampoline,
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 84d987d..fe75041 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.GlobalBackupManagerService.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 ce02476..82638b4 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 @@
@Override
public boolean onStartJob(JobParameters params) {
mParams = params;
- Trampoline service = GlobalBackupManagerService.getInstance();
+ Trampoline service = BackupManagerService.getInstance();
return service.beginFullBackup(this);
}
@@ -69,7 +69,7 @@
public boolean onStopJob(JobParameters params) {
if (mParams != null) {
mParams = null;
- Trampoline service = GlobalBackupManagerService.getInstance();
+ Trampoline service = BackupManagerService.getInstance();
service.endFullBackup();
}
return false;
diff --git a/services/backup/java/com/android/server/backup/KeyValueBackupJob.java b/services/backup/java/com/android/server/backup/KeyValueBackupJob.java
index 8156095..f2e7435 100644
--- a/services/backup/java/com/android/server/backup/KeyValueBackupJob.java
+++ b/services/backup/java/com/android/server/backup/KeyValueBackupJob.java
@@ -16,7 +16,7 @@
package com.android.server.backup;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;
+import static com.android.server.backup.BackupManagerService.DEBUG_SCHEDULING;
import android.app.AlarmManager;
import android.app.job.JobInfo;
@@ -118,7 +118,7 @@
}
// Time to run a key/value backup!
- Trampoline service = GlobalBackupManagerService.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 dd91381..edc2379 100644
--- a/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java
+++ b/services/backup/java/com/android/server/backup/ProcessedPackagesJournal.java
@@ -46,7 +46,7 @@
final class ProcessedPackagesJournal {
private static final String TAG = "ProcessedPackagesJournal";
private static final String JOURNAL_FILE_NAME = "processed";
- private static final boolean DEBUG = GlobalBackupManagerService.DEBUG;
+ private static final boolean DEBUG = BackupManagerService.DEBUG;
// 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 22edebc..59629aa 100644
--- a/services/backup/java/com/android/server/backup/Trampoline.java
+++ b/services/backup/java/com/android/server/backup/Trampoline.java
@@ -16,7 +16,7 @@
package com.android.server.backup;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.TAG;
import android.annotation.Nullable;
import android.app.admin.DevicePolicyManager;
@@ -52,12 +52,12 @@
import java.io.PrintWriter;
/**
- * A proxy to the {@link GlobalBackupManagerService} implementation.
+ * A proxy to the {@link BackupManagerService} implementation.
*
- * <p>This is an external interface to the {@link GlobalBackupManagerService} which is being
- * accessed via published binder {@link GlobalBackupManagerService.Lifecycle}. This lets us turn
- * down the heavy implementation object on the fly without disturbing binders that have been cached
- * somewhere in the system.
+ * <p>This is an external interface to the {@link BackupManagerService} which is being accessed via
+ * published binder {@link BackupManagerService.Lifecycle}. This lets us turn down the heavy
+ * implementation object on the fly without disturbing binders that have been cached somewhere in
+ * the system.
*
* <p>Trampoline determines whether the backup service is available. It can be disabled in the
* following two ways:
@@ -89,7 +89,7 @@
private final boolean mGlobalDisable;
private final Object mStateLock = new Object();
- private volatile GlobalBackupManagerService mService;
+ private volatile BackupManagerService mService;
private HandlerThread mHandlerThread;
public Trampoline(Context context) {
@@ -116,12 +116,12 @@
return mContext;
}
- protected GlobalBackupManagerService createBackupManagerService() {
- return GlobalBackupManagerService.create(mContext, this, mHandlerThread);
+ protected BackupManagerService createBackupManagerService() {
+ return BackupManagerService.create(mContext, this, mHandlerThread);
}
/**
- * Initialize {@link GlobalBackupManagerService} if the backup service is not disabled. Only the
+ * Initialize {@link BackupManagerService} if the backup service is not disabled. Only the
* system user can initialize the service.
*/
/* package */ void initializeService(int userId) {
@@ -145,11 +145,10 @@
}
/**
- * Called from {@link GlobalBackupManagerService.Lifecycle} when the system user is unlocked.
- * Attempts to initialize {@link GlobalBackupManagerService} and set backup state for the system
- * user.
+ * Called from {@link BackupManagerService.Lifecycle} when the system user is unlocked. Attempts
+ * to initialize {@link BackupManagerService} and set backup state for the system user.
*
- * @see GlobalBackupManagerService#unlockSystemUser()
+ * @see BackupManagerService#unlockSystemUser()
*/
void unlockSystemUser() {
mHandlerThread = new HandlerThread("backup", Process.THREAD_PRIORITY_BACKGROUND);
@@ -162,7 +161,7 @@
initializeService(UserHandle.USER_SYSTEM);
Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
- GlobalBackupManagerService service = mService;
+ BackupManagerService service = mService;
if (service != null) {
Slog.i(TAG, "Unlocking system user");
service.unlockSystemUser();
@@ -234,7 +233,7 @@
@Override
public void dataChanged(String packageName) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.dataChanged(packageName);
}
@@ -243,7 +242,7 @@
@Override
public void initializeTransports(String[] transportNames, IBackupObserver observer)
throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.initializeTransports(transportNames, observer);
}
@@ -252,7 +251,7 @@
@Override
public void clearBackupData(String transportName, String packageName)
throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.clearBackupData(transportName, packageName);
}
@@ -260,7 +259,7 @@
@Override
public void agentConnected(String packageName, IBinder agent) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.agentConnected(packageName, agent);
}
@@ -268,7 +267,7 @@
@Override
public void agentDisconnected(String packageName) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.agentDisconnected(packageName);
}
@@ -276,7 +275,7 @@
@Override
public void restoreAtInstall(String packageName, int token) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.restoreAtInstall(packageName, token);
}
@@ -284,7 +283,7 @@
@Override
public void setBackupEnabled(boolean isEnabled) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.setBackupEnabled(isEnabled);
}
@@ -292,7 +291,7 @@
@Override
public void setAutoRestore(boolean doAutoRestore) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.setAutoRestore(doAutoRestore);
}
@@ -300,7 +299,7 @@
@Override
public void setBackupProvisioned(boolean isProvisioned) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.setBackupProvisioned(isProvisioned);
}
@@ -308,25 +307,25 @@
@Override
public boolean isBackupEnabled() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.isBackupEnabled() : false;
}
@Override
public boolean setBackupPassword(String currentPw, String newPw) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.setBackupPassword(currentPw, newPw) : false;
}
@Override
public boolean hasBackupPassword() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.hasBackupPassword() : false;
}
@Override
public void backupNow() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.backupNow();
}
@@ -337,7 +336,7 @@
boolean includeShared, boolean doWidgets, boolean allApps,
boolean allIncludesSystem, boolean doCompress, boolean doKeyValue, String[] packageNames)
throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.adbBackup(fd, includeApks, includeObbs, includeShared, doWidgets,
allApps, allIncludesSystem, doCompress, doKeyValue, packageNames);
@@ -346,7 +345,7 @@
@Override
public void fullTransportBackup(String[] packageNames) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.fullTransportBackup(packageNames);
}
@@ -354,7 +353,7 @@
@Override
public void adbRestore(ParcelFileDescriptor fd) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.adbRestore(fd);
}
@@ -364,7 +363,7 @@
public void acknowledgeFullBackupOrRestore(int token, boolean allow, String curPassword,
String encryptionPassword, IFullBackupRestoreObserver observer)
throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.acknowledgeAdbBackupOrRestore(token, allow,
curPassword, encryptionPassword, observer);
@@ -373,7 +372,7 @@
@Override
public String getCurrentTransport() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getCurrentTransport() : null;
}
@@ -384,25 +383,25 @@
@Override
@Nullable
public ComponentName getCurrentTransportComponent() {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getCurrentTransportComponent() : null;
}
@Override
public String[] listAllTransports() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.listAllTransports() : null;
}
@Override
public ComponentName[] listAllTransportComponents() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.listAllTransportComponents() : null;
}
@Override
public String[] getTransportWhitelist() {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getTransportWhitelist() : null;
}
@@ -414,7 +413,7 @@
String currentDestinationString,
@Nullable Intent dataManagementIntent,
String dataManagementLabel) {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.updateTransportAttributes(
transportComponent,
@@ -428,14 +427,14 @@
@Override
public String selectBackupTransport(String transport) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.selectBackupTransport(transport) : null;
}
@Override
public void selectBackupTransportAsync(ComponentName transport,
ISelectBackupTransportCallback listener) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.selectBackupTransportAsync(transport, listener);
} else {
@@ -451,38 +450,38 @@
@Override
public Intent getConfigurationIntent(String transport) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getConfigurationIntent(transport) : null;
}
@Override
public String getDestinationString(String transport) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getDestinationString(transport) : null;
}
@Override
public Intent getDataManagementIntent(String transport) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getDataManagementIntent(transport) : null;
}
@Override
public String getDataManagementLabel(String transport) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getDataManagementLabel(transport) : null;
}
@Override
public IRestoreSession beginRestoreSession(String packageName, String transportID)
throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.beginRestoreSession(packageName, transportID) : null;
}
@Override
public void opComplete(int token, long result) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.opComplete(token, result);
}
@@ -490,26 +489,26 @@
@Override
public long getAvailableRestoreToken(String packageName) {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.getAvailableRestoreToken(packageName) : 0;
}
@Override
public boolean isAppEligibleForBackup(String packageName) {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.isAppEligibleForBackup(packageName) : false;
}
@Override
public String[] filterAppsEligibleForBackup(String[] packages) {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.filterAppsEligibleForBackup(packages) : null;
}
@Override
public int requestBackup(String[] packages, IBackupObserver observer,
IBackupManagerMonitor monitor, int flags) throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc == null) {
return BackupManager.ERROR_BACKUP_NOT_ALLOWED;
}
@@ -518,7 +517,7 @@
@Override
public void cancelBackups() throws RemoteException {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.cancelBackups();
}
@@ -528,7 +527,7 @@
public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.dump(fd, pw, args);
} else {
@@ -539,12 +538,12 @@
// Full backup/restore entry points - non-Binder; called directly
// by the full-backup scheduled job
/* package */ boolean beginFullBackup(FullBackupJob scheduledJob) {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
return (svc != null) ? svc.beginFullBackup(scheduledJob) : false;
}
/* package */ void endFullBackup() {
- GlobalBackupManagerService svc = mService;
+ BackupManagerService svc = mService;
if (svc != null) {
svc.endFullBackup();
}
diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
index 4855ae0..fe16afe 100644
--- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
@@ -18,10 +18,10 @@
import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_BACKUP_IN_FOREGROUND;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+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.TAG;
import static com.android.server.backup.internal.BackupHandler.MSG_BACKUP_OPERATION_TIMEOUT;
import static com.android.server.backup.internal.BackupHandler.MSG_FULL_CONFIRMATION_TIMEOUT;
import static com.android.server.backup.internal.BackupHandler.MSG_OP_COMPLETE;
@@ -2665,7 +2665,7 @@
boolean wasEnabled = mEnabled;
synchronized (this) {
// TODO(b/118520567): Clean up writing backup enabled logic.
- GlobalBackupManagerService.writeBackupEnableState(enable, UserHandle.USER_SYSTEM);
+ BackupManagerService.writeBackupEnableState(enable, UserHandle.USER_SYSTEM);
mEnabled = enable;
}
diff --git a/services/backup/java/com/android/server/backup/fullbackup/AppMetadataBackupWriter.java b/services/backup/java/com/android/server/backup/fullbackup/AppMetadataBackupWriter.java
index 725bc74..bace1aa 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/AppMetadataBackupWriter.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/AppMetadataBackupWriter.java
@@ -1,7 +1,7 @@
package com.android.server.backup.fullbackup;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.MORE_DEBUG;
+import static com.android.server.backup.BackupManagerService.TAG;
import static com.android.server.backup.UserBackupManagerService.BACKUP_MANIFEST_VERSION;
import static com.android.server.backup.UserBackupManagerService.BACKUP_METADATA_VERSION;
import static com.android.server.backup.UserBackupManagerService.BACKUP_WIDGET_METADATA_TOKEN;
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 e9aad02..6472ba3 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupEngine.java
@@ -16,9 +16,9 @@
package com.android.server.backup.fullbackup;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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.TAG;
import static com.android.server.backup.UserBackupManagerService.BACKUP_MANIFEST_FILENAME;
import static com.android.server.backup.UserBackupManagerService.BACKUP_METADATA_FILENAME;
import static com.android.server.backup.UserBackupManagerService.OP_TYPE_BACKUP_WAIT;
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 24784ea..e142537 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/FullBackupObbConnection.java
@@ -16,8 +16,8 @@
package com.android.server.backup.fullbackup;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.MORE_DEBUG;
+import static com.android.server.backup.BackupManagerService.TAG;
import static com.android.server.backup.UserBackupManagerService.OP_TYPE_BACKUP_WAIT;
import android.app.backup.IBackupManager;
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 0ed75bb..8f6923b 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.GlobalBackupManagerService.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 2f7687f..43a80c4 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/PerformAdbBackupTask.java
@@ -16,10 +16,10 @@
package com.android.server.backup.fullbackup;
+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.BackupPasswordManager.PBKDF_CURRENT;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
import static com.android.server.backup.UserBackupManagerService.BACKUP_FILE_HEADER_MAGIC;
import static com.android.server.backup.UserBackupManagerService.BACKUP_FILE_VERSION;
import static com.android.server.backup.UserBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE;
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 0d14e7e..5b449c5 100644
--- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java
+++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java
@@ -16,9 +16,9 @@
package com.android.server.backup.fullbackup;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG_SCHEDULING;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
+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.UserBackupManagerService.OP_PENDING;
import static com.android.server.backup.UserBackupManagerService.OP_TYPE_BACKUP;
import static com.android.server.backup.UserBackupManagerService.OP_TYPE_BACKUP_WAIT;
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 fd09466..ba153bf 100644
--- a/services/backup/java/com/android/server/backup/internal/BackupHandler.java
+++ b/services/backup/java/com/android/server/backup/internal/BackupHandler.java
@@ -16,9 +16,9 @@
package com.android.server.backup.internal;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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.TAG;
import android.app.backup.RestoreSet;
import android.content.Intent;
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 2bad5fe..5ffa795 100644
--- a/services/backup/java/com/android/server/backup/internal/PerformClearTask.java
+++ b/services/backup/java/com/android/server/backup/internal/PerformClearTask.java
@@ -16,7 +16,7 @@
package com.android.server.backup.internal;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.TAG;
import android.content.pm.PackageInfo;
import android.util.Slog;
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 1637e55..6b78fbf 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.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.TAG;
import android.annotation.Nullable;
import android.app.AlarmManager;
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 eab8662..7e2ac796 100644
--- a/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java
+++ b/services/backup/java/com/android/server/backup/internal/ProvisionedObserver.java
@@ -16,8 +16,8 @@
package com.android.server.backup.internal;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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;
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 d869f04..2a5d913 100644
--- a/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java
+++ b/services/backup/java/com/android/server/backup/internal/RunBackupReceiver.java
@@ -16,9 +16,9 @@
package com.android.server.backup.internal;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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.TAG;
import static com.android.server.backup.UserBackupManagerService.RUN_BACKUP_ACTION;
import static com.android.server.backup.internal.BackupHandler.MSG_RUN_BACKUP;
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 880e608..38870cb 100644
--- a/services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java
+++ b/services/backup/java/com/android/server/backup/internal/RunInitializeReceiver.java
@@ -16,8 +16,8 @@
package com.android.server.backup.internal;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.DEBUG;
+import static com.android.server.backup.BackupManagerService.TAG;
import static com.android.server.backup.UserBackupManagerService.RUN_INITIALIZE_ACTION;
import android.content.BroadcastReceiver;
diff --git a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java
index 437abd2..535c7cb 100644
--- a/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java
+++ b/services/backup/java/com/android/server/backup/keyvalue/KeyValueBackupReporter.java
@@ -28,8 +28,8 @@
import com.android.internal.annotations.VisibleForTesting;
import com.android.server.EventLogTags;
+import com.android.server.backup.BackupManagerService;
import com.android.server.backup.DataChangedJournal;
-import com.android.server.backup.GlobalBackupManagerService;
import com.android.server.backup.UserBackupManagerService;
import com.android.server.backup.remote.RemoteResult;
import com.android.server.backup.utils.BackupManagerMonitorUtils;
@@ -54,8 +54,8 @@
@VisibleForTesting
public class KeyValueBackupReporter {
@VisibleForTesting static final String TAG = "KeyValueBackupTask";
- private static final boolean DEBUG = GlobalBackupManagerService.DEBUG;
- @VisibleForTesting static final boolean MORE_DEBUG = GlobalBackupManagerService.MORE_DEBUG;
+ private static final boolean DEBUG = BackupManagerService.DEBUG;
+ @VisibleForTesting static final boolean MORE_DEBUG = BackupManagerService.MORE_DEBUG;
static void onNewThread(String threadName) {
if (DEBUG) {
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 5c05371..e273b32 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.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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;
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 8196e70..e4890e0 100644
--- a/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java
+++ b/services/backup/java/com/android/server/backup/restore/AdbRestoreFinishedLatch.java
@@ -16,8 +16,8 @@
package com.android.server.backup.restore;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
+import static com.android.server.backup.BackupManagerService.DEBUG;
+import static com.android.server.backup.BackupManagerService.MORE_DEBUG;
import android.util.Slog;
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 ee08902..0d26ea5 100644
--- a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java
+++ b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java
@@ -16,9 +16,9 @@
package com.android.server.backup.restore;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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.TAG;
import static com.android.server.backup.UserBackupManagerService.BACKUP_MANIFEST_FILENAME;
import static com.android.server.backup.UserBackupManagerService.BACKUP_METADATA_FILENAME;
import static com.android.server.backup.UserBackupManagerService.OP_TYPE_RESTORE_WAIT;
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 381252d..c904256 100644
--- a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java
+++ b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java
@@ -16,11 +16,11 @@
package com.android.server.backup.restore;
+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.BackupPasswordManager.PBKDF_CURRENT;
import static com.android.server.backup.BackupPasswordManager.PBKDF_FALLBACK;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
import static com.android.server.backup.UserBackupManagerService.BACKUP_FILE_HEADER_MAGIC;
import static com.android.server.backup.UserBackupManagerService.BACKUP_FILE_VERSION;
import static com.android.server.backup.UserBackupManagerService.SETTINGS_PACKAGE;
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 7530356..f7efad6 100644
--- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
+++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java
@@ -16,9 +16,9 @@
package com.android.server.backup.restore;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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.TAG;
import static com.android.server.backup.UserBackupManagerService.KEY_WIDGET_STATE;
import static com.android.server.backup.UserBackupManagerService.OP_TYPE_RESTORE_WAIT;
import static com.android.server.backup.UserBackupManagerService.PACKAGE_MANAGER_SENTINEL;
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 2452e48..e465c7e 100644
--- a/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java
+++ b/services/backup/java/com/android/server/backup/utils/AppBackupUtils.java
@@ -16,8 +16,8 @@
package com.android.server.backup.utils;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.MORE_DEBUG;
+import static com.android.server.backup.BackupManagerService.TAG;
import static com.android.server.backup.UserBackupManagerService.SHARED_BACKUP_AGENT_PACKAGE;
import android.annotation.Nullable;
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 8b931d4..6f08376 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 @@
import static android.app.backup.BackupManagerMonitor.EXTRA_LOG_EVENT_PACKAGE_NAME;
-import static com.android.server.backup.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.DEBUG;
+import static com.android.server.backup.BackupManagerService.TAG;
import android.annotation.Nullable;
import android.app.backup.BackupManagerMonitor;
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 9674c3d..c0cf2ef 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.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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 92cdf0d..fa856ce 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.GlobalBackupManagerService.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 a6fdbf0..dbe3cd9 100644
--- a/services/backup/java/com/android/server/backup/utils/FullBackupUtils.java
+++ b/services/backup/java/com/android/server/backup/utils/FullBackupUtils.java
@@ -16,7 +16,7 @@
package com.android.server.backup.utils;
-import static com.android.server.backup.GlobalBackupManagerService.TAG;
+import static com.android.server.backup.BackupManagerService.TAG;
import android.os.ParcelFileDescriptor;
import android.util.Slog;
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 65adf4e..a7eb644 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.GlobalBackupManagerService.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 91567d7..df7e6d45 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.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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 c295684..0f4b681 100644
--- a/services/backup/java/com/android/server/backup/utils/TarBackupReader.java
+++ b/services/backup/java/com/android/server/backup/utils/TarBackupReader.java
@@ -34,9 +34,9 @@
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.GlobalBackupManagerService.DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.MORE_DEBUG;
-import static com.android.server.backup.GlobalBackupManagerService.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.TAG;
import static com.android.server.backup.UserBackupManagerService.BACKUP_MANIFEST_FILENAME;
import static com.android.server.backup.UserBackupManagerService.BACKUP_MANIFEST_VERSION;
import static com.android.server.backup.UserBackupManagerService.BACKUP_METADATA_FILENAME;
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index fbfb284..f8ac41f 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -178,7 +178,7 @@
* them from the build system somehow.
*/
private static final String BACKUP_MANAGER_SERVICE_CLASS =
- "com.android.server.backup.GlobalBackupManagerService$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/GlobalBackupManagerServiceTest.java b/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java
similarity index 85%
rename from services/robotests/src/com/android/server/backup/GlobalBackupManagerServiceTest.java
rename to services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java
index 3108c80..ba4caf44 100644
--- a/services/robotests/src/com/android/server/backup/GlobalBackupManagerServiceTest.java
+++ b/services/robotests/src/com/android/server/backup/BackupManagerServiceTest.java
@@ -49,43 +49,43 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
-/** Tests for the user-aware backup/restore system service {@link GlobalBackupManagerService}. */
+/** Tests for the user-aware backup/restore system service {@link BackupManagerService}. */
@RunWith(RobolectricTestRunner.class)
@Presubmit
-public class GlobalBackupManagerServiceTest {
+public class BackupManagerServiceTest {
private static final String TEST_PACKAGE = "package";
private static final String TEST_TRANSPORT = "transport";
@Mock private UserBackupManagerService mUserBackupManagerService;
@Mock private TransportManager mTransportManager;
- private GlobalBackupManagerService mGlobalBackupManagerService;
+ private BackupManagerService mBackupManagerService;
private Context mContext;
- /** Initialize {@link GlobalBackupManagerService}. */
+ /** Initialize {@link BackupManagerService}. */
@Before
public void setUp() throws Exception {
MockitoAnnotations.initMocks(this);
Application application = RuntimeEnvironment.application;
mContext = application;
- mGlobalBackupManagerService =
- new GlobalBackupManagerService(
+ mBackupManagerService =
+ new BackupManagerService(
application,
new Trampoline(application),
BackupManagerServiceTestUtils.startBackupThread(null),
new File(application.getCacheDir(), "base_state"),
new File(application.getCacheDir(), "data"),
mTransportManager);
- mGlobalBackupManagerService.setUserBackupManagerService(mUserBackupManagerService);
+ mBackupManagerService.setUserBackupManagerService(mUserBackupManagerService);
}
/**
- * Test verifying that {@link GlobalBackupManagerService#MORE_DEBUG} is set to {@code false}.
+ * Test verifying that {@link BackupManagerService#MORE_DEBUG} is set to {@code false}.
* This is specifically to prevent overloading the logs in production.
*/
@Test
public void testMoreDebug_isFalse() throws Exception {
- boolean moreDebug = GlobalBackupManagerService.MORE_DEBUG;
+ boolean moreDebug = BackupManagerService.MORE_DEBUG;
assertThat(moreDebug).isFalse();
}
@@ -101,7 +101,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testDataChanged_callsDataChangedForUser() throws Exception {
- mGlobalBackupManagerService.dataChanged(TEST_PACKAGE);
+ mBackupManagerService.dataChanged(TEST_PACKAGE);
verify(mUserBackupManagerService).dataChanged(TEST_PACKAGE);
}
@@ -111,7 +111,7 @@
public void testAgentConnected_callsAgentConnectedForUser() throws Exception {
IBinder agentBinder = mock(IBinder.class);
- mGlobalBackupManagerService.agentConnected(TEST_PACKAGE, agentBinder);
+ mBackupManagerService.agentConnected(TEST_PACKAGE, agentBinder);
verify(mUserBackupManagerService).agentConnected(TEST_PACKAGE, agentBinder);
}
@@ -119,7 +119,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testAgentDisconnected_callsAgentDisconnectedForUser() throws Exception {
- mGlobalBackupManagerService.agentDisconnected(TEST_PACKAGE);
+ mBackupManagerService.agentDisconnected(TEST_PACKAGE);
verify(mUserBackupManagerService).agentDisconnected(TEST_PACKAGE);
}
@@ -127,7 +127,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testOpComplete_callsOpCompleteForUser() throws Exception {
- mGlobalBackupManagerService.opComplete(/* token */ 0, /* result */ 0L);
+ mBackupManagerService.opComplete(/* token */ 0, /* result */ 0L);
verify(mUserBackupManagerService).opComplete(/* token */ 0, /* result */ 0L);
}
@@ -141,7 +141,7 @@
public void testInitializeTransports_callsInitializeTransportsForUser() throws Exception {
String[] transports = {TEST_TRANSPORT};
- mGlobalBackupManagerService.initializeTransports(transports, /* observer */ null);
+ mBackupManagerService.initializeTransports(transports, /* observer */ null);
verify(mUserBackupManagerService).initializeTransports(transports, /* observer */ null);
}
@@ -149,7 +149,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testClearBackupData_callsClearBackupDataForUser() throws Exception {
- mGlobalBackupManagerService.clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);
+ mBackupManagerService.clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);
verify(mUserBackupManagerService).clearBackupData(TEST_TRANSPORT, TEST_PACKAGE);
}
@@ -157,7 +157,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testGetCurrentTransport_callsGetCurrentTransportForUser() throws Exception {
- mGlobalBackupManagerService.getCurrentTransport();
+ mBackupManagerService.getCurrentTransport();
verify(mUserBackupManagerService).getCurrentTransport();
}
@@ -166,7 +166,7 @@
@Test
public void testGetCurrentTransportComponent_callsGetCurrentTransportComponentForUser()
throws Exception {
- mGlobalBackupManagerService.getCurrentTransportComponent();
+ mBackupManagerService.getCurrentTransportComponent();
verify(mUserBackupManagerService).getCurrentTransportComponent();
}
@@ -174,7 +174,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testListAllTransports_callsListAllTransportsForUser() throws Exception {
- mGlobalBackupManagerService.listAllTransports();
+ mBackupManagerService.listAllTransports();
verify(mUserBackupManagerService).listAllTransports();
}
@@ -183,7 +183,7 @@
@Test
public void testListAllTransportComponents_callsListAllTransportComponentsForUser()
throws Exception {
- mGlobalBackupManagerService.listAllTransportComponents();
+ mBackupManagerService.listAllTransportComponents();
verify(mUserBackupManagerService).listAllTransportComponents();
}
@@ -191,7 +191,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testGetTransportWhitelist_callsGetTransportWhitelistForUser() throws Exception {
- mGlobalBackupManagerService.getTransportWhitelist();
+ mBackupManagerService.getTransportWhitelist();
verify(mUserBackupManagerService).getTransportWhitelist();
}
@@ -204,7 +204,7 @@
Intent configurationIntent = new Intent();
Intent dataManagementIntent = new Intent();
- mGlobalBackupManagerService.updateTransportAttributes(
+ mBackupManagerService.updateTransportAttributes(
transport.getTransportComponent(),
transport.transportName,
configurationIntent,
@@ -225,7 +225,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testSelectBackupTransport_callsSelectBackupTransportForUser() throws Exception {
- mGlobalBackupManagerService.selectBackupTransport(TEST_TRANSPORT);
+ mBackupManagerService.selectBackupTransport(TEST_TRANSPORT);
verify(mUserBackupManagerService).selectBackupTransport(TEST_TRANSPORT);
}
@@ -236,7 +236,7 @@
TransportData transport = backupTransport();
ISelectBackupTransportCallback callback = mock(ISelectBackupTransportCallback.class);
- mGlobalBackupManagerService.selectBackupTransportAsync(
+ mBackupManagerService.selectBackupTransportAsync(
transport.getTransportComponent(), callback);
verify(mUserBackupManagerService)
@@ -246,7 +246,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testGetConfigurationIntent_callsGetConfigurationIntentForUser() throws Exception {
- mGlobalBackupManagerService.getConfigurationIntent(TEST_TRANSPORT);
+ mBackupManagerService.getConfigurationIntent(TEST_TRANSPORT);
verify(mUserBackupManagerService).getConfigurationIntent(TEST_TRANSPORT);
}
@@ -254,7 +254,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testGetDestinationString_callsGetDestinationStringForUser() throws Exception {
- mGlobalBackupManagerService.getDestinationString(TEST_TRANSPORT);
+ mBackupManagerService.getDestinationString(TEST_TRANSPORT);
verify(mUserBackupManagerService).getDestinationString(TEST_TRANSPORT);
}
@@ -262,7 +262,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testGetDataManagementIntent_callsGetDataManagementIntentForUser() throws Exception {
- mGlobalBackupManagerService.getDataManagementIntent(TEST_TRANSPORT);
+ mBackupManagerService.getDataManagementIntent(TEST_TRANSPORT);
verify(mUserBackupManagerService).getDataManagementIntent(TEST_TRANSPORT);
}
@@ -270,7 +270,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testGetDataManagementLabel_callsGetDataManagementLabelForUser() throws Exception {
- mGlobalBackupManagerService.getDataManagementLabel(TEST_TRANSPORT);
+ mBackupManagerService.getDataManagementLabel(TEST_TRANSPORT);
verify(mUserBackupManagerService).getDataManagementLabel(TEST_TRANSPORT);
}
@@ -282,7 +282,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void setBackupEnabled_callsSetBackupEnabledForUser() throws Exception {
- mGlobalBackupManagerService.setBackupEnabled(true);
+ mBackupManagerService.setBackupEnabled(true);
verify(mUserBackupManagerService).setBackupEnabled(true);
}
@@ -290,7 +290,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void setAutoRestore_callsSetAutoRestoreForUser() throws Exception {
- mGlobalBackupManagerService.setAutoRestore(true);
+ mBackupManagerService.setAutoRestore(true);
verify(mUserBackupManagerService).setAutoRestore(true);
}
@@ -298,7 +298,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testSetBackupProvisioned_callsSetBackupProvisionedForUser() throws Exception {
- mGlobalBackupManagerService.setBackupProvisioned(true);
+ mBackupManagerService.setBackupProvisioned(true);
verify(mUserBackupManagerService).setBackupProvisioned(true);
}
@@ -306,7 +306,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testIsBackupEnabled_callsIsBackupEnabledForUser() throws Exception {
- mGlobalBackupManagerService.isBackupEnabled();
+ mBackupManagerService.isBackupEnabled();
verify(mUserBackupManagerService).isBackupEnabled();
}
@@ -318,7 +318,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testIsAppEligibleForBackup_callsIsAppEligibleForBackupForUser() throws Exception {
- mGlobalBackupManagerService.isAppEligibleForBackup(TEST_PACKAGE);
+ mBackupManagerService.isAppEligibleForBackup(TEST_PACKAGE);
verify(mUserBackupManagerService).isAppEligibleForBackup(TEST_PACKAGE);
}
@@ -329,7 +329,7 @@
throws Exception {
String[] packages = {TEST_PACKAGE};
- mGlobalBackupManagerService.filterAppsEligibleForBackup(packages);
+ mBackupManagerService.filterAppsEligibleForBackup(packages);
verify(mUserBackupManagerService).filterAppsEligibleForBackup(packages);
}
@@ -337,7 +337,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testBackupNow_callsBackupNowForUser() throws Exception {
- mGlobalBackupManagerService.backupNow();
+ mBackupManagerService.backupNow();
verify(mUserBackupManagerService).backupNow();
}
@@ -349,7 +349,7 @@
IBackupObserver observer = mock(IBackupObserver.class);
IBackupManagerMonitor monitor = mock(IBackupManagerMonitor.class);
- mGlobalBackupManagerService.requestBackup(packages, observer, monitor, /* flags */ 0);
+ mBackupManagerService.requestBackup(packages, observer, monitor, /* flags */ 0);
verify(mUserBackupManagerService).requestBackup(packages, observer, monitor, /* flags */ 0);
}
@@ -357,7 +357,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testCancelBackups_callsCancelBackupsForUser() throws Exception {
- mGlobalBackupManagerService.cancelBackups();
+ mBackupManagerService.cancelBackups();
verify(mUserBackupManagerService).cancelBackups();
}
@@ -367,7 +367,7 @@
public void testBeginFullBackup_callsBeginFullBackupForUser() throws Exception {
FullBackupJob job = new FullBackupJob();
- mGlobalBackupManagerService.beginFullBackup(job);
+ mBackupManagerService.beginFullBackup(job);
verify(mUserBackupManagerService).beginFullBackup(job);
}
@@ -375,7 +375,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testEndFullBackup_callsEndFullBackupForUser() throws Exception {
- mGlobalBackupManagerService.endFullBackup();
+ mBackupManagerService.endFullBackup();
verify(mUserBackupManagerService).endFullBackup();
}
@@ -385,7 +385,7 @@
public void testFullTransportBackup_callsFullTransportBackupForUser() throws Exception {
String[] packages = {TEST_PACKAGE};
- mGlobalBackupManagerService.fullTransportBackup(packages);
+ mBackupManagerService.fullTransportBackup(packages);
verify(mUserBackupManagerService).fullTransportBackup(packages);
}
@@ -397,7 +397,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testRestoreAtInstall_callsRestoreAtInstallForUser() throws Exception {
- mGlobalBackupManagerService.restoreAtInstall(TEST_PACKAGE, /* token */ 0);
+ mBackupManagerService.restoreAtInstall(TEST_PACKAGE, /* token */ 0);
verify(mUserBackupManagerService).restoreAtInstall(TEST_PACKAGE, /* token */ 0);
}
@@ -405,7 +405,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testBeginRestoreSession_callsBeginRestoreSessionForUser() throws Exception {
- mGlobalBackupManagerService.beginRestoreSession(TEST_PACKAGE, TEST_TRANSPORT);
+ mBackupManagerService.beginRestoreSession(TEST_PACKAGE, TEST_TRANSPORT);
verify(mUserBackupManagerService).beginRestoreSession(TEST_PACKAGE, TEST_TRANSPORT);
}
@@ -414,7 +414,7 @@
@Test
public void testGetAvailableRestoreToken_callsGetAvailableRestoreTokenForUser()
throws Exception {
- mGlobalBackupManagerService.getAvailableRestoreToken(TEST_PACKAGE);
+ mBackupManagerService.getAvailableRestoreToken(TEST_PACKAGE);
verify(mUserBackupManagerService).getAvailableRestoreToken(TEST_PACKAGE);
}
@@ -426,7 +426,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testSetBackupPassword_callsSetBackupPasswordForUser() throws Exception {
- mGlobalBackupManagerService.setBackupPassword("currentPassword", "newPassword");
+ mBackupManagerService.setBackupPassword("currentPassword", "newPassword");
verify(mUserBackupManagerService).setBackupPassword("currentPassword", "newPassword");
}
@@ -434,7 +434,7 @@
/** Test that the backup service routes methods correctly to the user that requests it. */
@Test
public void testHasBackupPassword_callsHasBackupPasswordForUser() throws Exception {
- mGlobalBackupManagerService.hasBackupPassword();
+ mBackupManagerService.hasBackupPassword();
verify(mUserBackupManagerService).hasBackupPassword();
}
@@ -448,7 +448,7 @@
ParcelFileDescriptor.open(testFile, ParcelFileDescriptor.MODE_READ_WRITE);
String[] packages = {TEST_PACKAGE};
- mGlobalBackupManagerService.adbBackup(
+ mBackupManagerService.adbBackup(
parcelFileDescriptor,
/* includeApks */ true,
/* includeObbs */ true,
@@ -482,7 +482,7 @@
ParcelFileDescriptor parcelFileDescriptor =
ParcelFileDescriptor.open(testFile, ParcelFileDescriptor.MODE_READ_WRITE);
- mGlobalBackupManagerService.adbRestore(parcelFileDescriptor);
+ mBackupManagerService.adbRestore(parcelFileDescriptor);
verify(mUserBackupManagerService).adbRestore(parcelFileDescriptor);
}
@@ -493,7 +493,7 @@
throws Exception {
IFullBackupRestoreObserver observer = mock(IFullBackupRestoreObserver.class);
- mGlobalBackupManagerService.acknowledgeAdbBackupOrRestore(
+ mBackupManagerService.acknowledgeAdbBackupOrRestore(
/* token */ 0, /* allow */ true, "currentPassword", "encryptionPassword", observer);
verify(mUserBackupManagerService)
@@ -518,7 +518,7 @@
PrintWriter printWriter = new PrintWriter(testFile);
String[] args = {"1", "2"};
- mGlobalBackupManagerService.dump(fileDescriptor, printWriter, args);
+ mBackupManagerService.dump(fileDescriptor, printWriter, args);
verify(mUserBackupManagerService).dump(fileDescriptor, printWriter, args);
}
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 8ec0759..a14cc51 100644
--- a/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java
+++ b/services/robotests/src/com/android/server/backup/internal/PerformInitializeTaskTest.java
@@ -44,7 +44,7 @@
import android.util.Log;
import com.android.internal.backup.IBackupTransport;
-import com.android.server.backup.GlobalBackupManagerService;
+import com.android.server.backup.BackupManagerService;
import com.android.server.backup.TransportManager;
import com.android.server.backup.UserBackupManagerService;
import com.android.server.backup.testing.TransportData;
@@ -212,7 +212,7 @@
performInitializeTask.run();
assertLogcatContains(
- GlobalBackupManagerService.TAG,
+ BackupManagerService.TAG,
log -> log.msg.contains("finishBackup()") && log.type >= Log.ERROR);
}
@@ -225,7 +225,7 @@
performInitializeTask.run();
assertLogcatContains(
- GlobalBackupManagerService.TAG,
+ BackupManagerService.TAG,
log -> log.msg.contains("initializeDevice()") && log.type >= Log.ERROR);
}
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 c99e2a8..7c00299 100644
--- a/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
+++ b/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
@@ -83,7 +83,7 @@
};
private final int NON_USER_SYSTEM = UserHandle.USER_SYSTEM + 1;
- @Mock private GlobalBackupManagerService mBackupManagerServiceMock;
+ @Mock private BackupManagerService mBackupManagerServiceMock;
@Mock private Context mContextMock;
@Mock private File mSuppressFileMock;
@Mock private File mSuppressFileParentMock;
@@ -864,7 +864,7 @@
static boolean sBackupDisabled = false;
static File sSuppressFile = null;
static int sCallingUid = -1;
- static GlobalBackupManagerService sBackupManagerServiceMock = null;
+ static BackupManagerService sBackupManagerServiceMock = null;
private int mCreateServiceCallsCount = 0;
TrampolineTestable(Context context) {
@@ -887,7 +887,7 @@
}
@Override
- protected GlobalBackupManagerService createBackupManagerService() {
+ protected BackupManagerService createBackupManagerService() {
mCreateServiceCallsCount++;
return sBackupManagerServiceMock;
}