[Multi-user] Consolidate system and non-system user unlock callbacks
In Trampoline, initializing the BMS service and starting the service for
the system user are now handled separately. System and non-system users
now both use the same unlock callback to bring up their UserBMS instance.
Bug: 120212806
Test: 1) atest RunBackupFrameworksServicesRoboTests
2) atest TrampolineTest
3) Unlock system user -> starts service for user
4) Multi-user enabled + unlock non-system user -> starts service for
user
Change-Id: Id49bb4a3834eb299be69d924b94a36794a4eb2e4
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index a9f4e46..f702d0f 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -125,20 +125,6 @@
}
/**
- * Called through Trampoline from {@link Lifecycle#onUnlockUser(int)}. We run the heavy work on
- * a background thread to keep the unlock time down.
- */
- public void unlockSystemUser() {
- Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backup enable");
- try {
- sInstance.setBackupEnabled(readBackupEnableState(UserHandle.USER_SYSTEM));
- } catch (RemoteException e) {
- // can't happen; it's a local object
- }
- Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
- }
-
- /**
* Starts the backup service for user {@code userId} by creating a new instance of {@link
* UserBackupManagerService} and registering it with this service.
*/
@@ -152,10 +138,19 @@
/**
* Starts the backup service for user {@code userId} by registering its instance of {@link
- * UserBackupManagerService} with this service.
+ * UserBackupManagerService} with this service and setting enabled state.
*/
void startServiceForUser(int userId, UserBackupManagerService userBackupManagerService) {
mServiceUsers.put(userId, userBackupManagerService);
+
+ Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backup enable");
+ try {
+ // TODO(b/121198604): Make enable file per-user and clean up indirection.
+ mTrampoline.setBackupEnabledForUser(userId, readBackupEnableState(userId));
+ } catch (RemoteException e) {
+ // Can't happen, it's a local object.
+ }
+ Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
}
SparseArray<UserBackupManagerService> getServiceUsers() {
@@ -171,7 +166,7 @@
* UserBackupManagerService}.
* @param caller A {@link String} identifying the caller for logging purposes.
* @throws SecurityException if {@code userId} is different from the calling user id and the
- * caller does NOT have the android.permission.INTERACT_ACROSS_USERS_FULL permission.
+ * caller does NOT have the android.permission.INTERACT_ACROSS_USERS_FULL permission.
*/
@Nullable
@VisibleForTesting
@@ -821,10 +816,9 @@
@Override
public void onUnlockUser(int userId) {
if (userId == UserHandle.USER_SYSTEM) {
- sInstance.initializeServiceAndUnlockSystemUser();
- } else {
- sInstance.unlockUser(userId);
+ sInstance.initializeService();
}
+ sInstance.unlockUser(userId);
}
}
}
diff --git a/services/backup/java/com/android/server/backup/Trampoline.java b/services/backup/java/com/android/server/backup/Trampoline.java
index d403680..e295c53a 100644
--- a/services/backup/java/com/android/server/backup/Trampoline.java
+++ b/services/backup/java/com/android/server/backup/Trampoline.java
@@ -150,61 +150,38 @@
}
/**
- * Initialize {@link BackupManagerService} if the backup service is not disabled. Only the
- * system user can initialize the service.
- */
- /* package */ void initializeService(int userId) {
- if (mGlobalDisable) {
- Slog.i(TAG, "Backup service not supported");
- return;
- }
-
- if (userId != UserHandle.USER_SYSTEM) {
- Slog.i(TAG, "Cannot initialize backup service for non-system user: " + userId);
- return;
- }
-
- synchronized (mStateLock) {
- if (!mSuppressFile.exists()) {
- mService = createBackupManagerService();
- } else {
- Slog.i(TAG, "Backup service inactive");
- }
- }
- }
-
- /**
* Called from {@link BackupManagerService.Lifecycle} when the system user is unlocked. Attempts
- * to initialize {@link BackupManagerService} and set backup state for the system user.
+ * to initialize {@link BackupManagerService}. Offloads work onto the handler thread {@link
+ * #mHandlerThread} to keep unlock time low.
*/
- void initializeServiceAndUnlockSystemUser() {
+ void initializeService() {
postToHandler(
() -> {
- // Initialize the backup service.
Trace.traceBegin(Trace.TRACE_TAG_ACTIVITY_MANAGER, "backup init");
- initializeService(UserHandle.USER_SYSTEM);
- Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
-
- // Start the service for the system user.
- BackupManagerService service = mService;
- if (service != null) {
- Slog.i(TAG, "Starting service for system user");
- service.startServiceForUser(UserHandle.USER_SYSTEM);
- Slog.i(TAG, "Unlocking system user");
- service.unlockSystemUser();
+ if (mGlobalDisable) {
+ Slog.i(TAG, "Backup service not supported");
+ return;
}
+
+ synchronized (mStateLock) {
+ if (!mSuppressFile.exists()) {
+ mService = createBackupManagerService();
+ } else {
+ Slog.i(TAG, "Backup service inactive");
+ }
+ }
+ Trace.traceEnd(Trace.TRACE_TAG_ACTIVITY_MANAGER);
});
}
/**
- * Called from {@link BackupManagerService.Lifecycle} when a non-system user {@code userId} is
- * unlocked. Starts the backup service for this user if the service supports multi-user.
- * Offloads work onto the handler thread {@link #mHandlerThread} to keep unlock time low.
+ * Called from {@link BackupManagerService.Lifecycle} when a user {@code userId} is unlocked.
+ * Starts the backup service for this user if it's the system user or if the service supports
+ * multi-user. Offloads work onto the handler thread {@link #mHandlerThread} to keep unlock time
+ * low.
*/
- // TODO(b/120212806): Consolidate service start for system and non-system users when system
- // user-only logic is removed.
void unlockUser(int userId) {
- if (!isMultiUserEnabled()) {
+ if (userId != UserHandle.USER_SYSTEM && !isMultiUserEnabled()) {
Slog.i(TAG, "Multi-user disabled, cannot start service for user: " + userId);
return;
}
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 0851cf3..1f37722 100644
--- a/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
+++ b/services/tests/servicestests/src/com/android/server/backup/TrampolineTest.java
@@ -23,6 +23,7 @@
import static junit.framework.Assert.assertTrue;
import static junit.framework.Assert.fail;
+import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.verify;
@@ -132,9 +133,19 @@
}
@Test
+ public void unlockUser_whenMultiUserSettingDisabled_callsBackupManagerServiceForSystemUser() {
+ Settings.Global.putInt(mContentResolver, Settings.Global.BACKUP_MULTI_USER_ENABLED, 0);
+ mTrampoline.initializeService();
+
+ mTrampoline.unlockUser(UserHandle.USER_SYSTEM);
+
+ verify(mBackupManagerServiceMock).startServiceForUser(UserHandle.USER_SYSTEM);
+ }
+
+ @Test
public void unlockUser_whenMultiUserSettingDisabled_isIgnoredForNonSystemUser() {
Settings.Global.putInt(mContentResolver, Settings.Global.BACKUP_MULTI_USER_ENABLED, 0);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.unlockUser(10);
@@ -144,7 +155,7 @@
@Test
public void unlockUser_whenMultiUserSettingEnabled_callsBackupManagerServiceForNonSystemUser() {
Settings.Global.putInt(mContentResolver, Settings.Global.BACKUP_MULTI_USER_ENABLED, 1);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.unlockUser(10);
@@ -152,27 +163,18 @@
}
@Test
- public void initializeService_forUserSystem_successfullyInitialized() {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ public void initializeService_successfullyInitializesBackupService() {
+ mTrampoline.initializeService();
assertTrue(mTrampoline.isBackupServiceActive(UserHandle.USER_SYSTEM));
}
- // The BackupManagerService can only be initialized by USER_SYSTEM, so we check that if any
- // other user trying to initialize it leaves it non-active.
- @Test
- public void initializeService_forNonUserSystem_nonInitialized() {
- mTrampoline.initializeService(NON_USER_SYSTEM);
-
- assertFalse(mTrampoline.isBackupServiceActive(NON_USER_SYSTEM));
- }
-
@Test
public void initializeService_globallyDisabled_nonInitialized() {
TrampolineTestable.sBackupDisabled = true;
-
TrampolineTestable trampoline = new TrampolineTestable(mContextMock);
- trampoline.initializeService(UserHandle.USER_SYSTEM);
+
+ trampoline.initializeService();
assertFalse(trampoline.isBackupServiceActive(UserHandle.USER_SYSTEM));
}
@@ -181,14 +183,21 @@
@Test
public void initializeService_suppressFileExists_nonInitialized() {
when(mSuppressFileMock.exists()).thenReturn(true);
-
TrampolineTestable trampoline = new TrampolineTestable(mContextMock);
- trampoline.initializeService(UserHandle.USER_SYSTEM);
+
+ trampoline.initializeService();
assertFalse(trampoline.isBackupServiceActive(UserHandle.USER_SYSTEM));
}
@Test
+ public void initializeService_doesNotStartServiceForUsers() {
+ mTrampoline.initializeService();
+
+ verify(mBackupManagerServiceMock, never()).startServiceForUser(anyInt());
+ }
+
+ @Test
public void isBackupServiceActive_calledBeforeInitialize_returnsFalse() {
assertFalse(mTrampoline.isBackupServiceActive(UserHandle.USER_SYSTEM));
}
@@ -263,7 +272,7 @@
@Test
public void setBackupServiceActive_makeNonActive_serviceDeletedAndSuppressFileCreated()
throws IOException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertTrue(mTrampoline.isBackupServiceActive(UserHandle.USER_SYSTEM));
mTrampoline.setBackupServiceActive(UserHandle.USER_SYSTEM, false);
@@ -277,7 +286,7 @@
setBackupServiceActive_makeNonActive_serviceDeletedAndSuppressFileCreated_ioExceptionHandled()
throws IOException {
when(mSuppressFileMock.createNewFile()).thenThrow(new IOException());
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertTrue(mTrampoline.isBackupServiceActive(UserHandle.USER_SYSTEM));
mTrampoline.setBackupServiceActive(UserHandle.USER_SYSTEM, false);
@@ -303,7 +312,7 @@
@Test
public void dataChangedForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.dataChangedForUser(mUserId, PACKAGE_NAME);
@@ -313,7 +322,7 @@
@Test
public void dataChanged_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.dataChanged(PACKAGE_NAME);
@@ -328,7 +337,7 @@
@Test
public void clearBackupDataForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.clearBackupDataForUser(mUserId, TRANSPORT_NAME, PACKAGE_NAME);
@@ -338,7 +347,7 @@
@Test
public void clearBackupData_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.clearBackupData(TRANSPORT_NAME, PACKAGE_NAME);
@@ -353,7 +362,7 @@
@Test
public void agentConnectedForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.agentConnectedForUser(mUserId, PACKAGE_NAME, mAgentMock);
@@ -363,7 +372,7 @@
@Test
public void agentConnected_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.agentConnected(PACKAGE_NAME, mAgentMock);
@@ -378,7 +387,7 @@
@Test
public void agentDisconnectedForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.agentDisconnectedForUser(mUserId, PACKAGE_NAME);
@@ -388,7 +397,7 @@
@Test
public void agentDisconnected_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.agentDisconnected(PACKAGE_NAME);
@@ -403,7 +412,7 @@
@Test
public void restoreAtInstallForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.restoreAtInstallForUser(mUserId, PACKAGE_NAME, 123);
@@ -413,7 +422,7 @@
@Test
public void restoreAtInstall_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.restoreAtInstall(PACKAGE_NAME, 123);
@@ -428,7 +437,7 @@
@Test
public void setBackupEnabledForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.setBackupEnabledForUser(mUserId, true);
@@ -438,7 +447,7 @@
@Test
public void setBackupEnabled_forwardedToCallingUserId() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.setBackupEnabled(true);
@@ -453,7 +462,7 @@
@Test
public void setAutoRestoreForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.setAutoRestoreForUser(mUserId, true);
@@ -463,7 +472,7 @@
@Test
public void setAutoRestore_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.setAutoRestore(true);
@@ -478,7 +487,7 @@
@Test
public void setBackupProvisioned_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.setBackupProvisioned(true);
verifyNoMoreInteractions(mBackupManagerServiceMock);
}
@@ -491,7 +500,7 @@
@Test
public void isBackupEnabledForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.isBackupEnabledForUser(mUserId);
@@ -501,7 +510,7 @@
@Test
public void isBackupEnabled_forwardedToCallingUserId() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.isBackupEnabled();
@@ -516,7 +525,7 @@
@Test
public void setBackupPassword_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.setBackupPassword(CURRENT_PASSWORD, NEW_PASSWORD);
verify(mBackupManagerServiceMock).setBackupPassword(CURRENT_PASSWORD, NEW_PASSWORD);
}
@@ -529,7 +538,7 @@
@Test
public void hasBackupPassword_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.hasBackupPassword();
verify(mBackupManagerServiceMock).hasBackupPassword();
}
@@ -542,7 +551,7 @@
@Test
public void backupNowForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.backupNowForUser(mUserId);
@@ -552,7 +561,7 @@
@Test
public void backupNow_forwardedToCallingUserId() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.backupNow();
@@ -569,7 +578,7 @@
@Test
public void adbBackup_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.adbBackup(mUserId, mParcelFileDescriptorMock, true, true,
true, true, true, true, true, true,
PACKAGE_NAMES);
@@ -585,7 +594,7 @@
@Test
public void fullTransportBackupForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.fullTransportBackupForUser(mUserId, PACKAGE_NAMES);
@@ -600,7 +609,7 @@
@Test
public void adbRestore_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.adbRestore(mUserId, mParcelFileDescriptorMock);
verify(mBackupManagerServiceMock).adbRestore(mUserId, mParcelFileDescriptorMock);
}
@@ -615,7 +624,7 @@
@Test
public void acknowledgeFullBackupOrRestoreForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.acknowledgeFullBackupOrRestoreForUser(
mUserId,
@@ -638,7 +647,7 @@
@Test
public void acknowledgeFullBackupOrRestore_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.acknowledgeFullBackupOrRestore(123, true, CURRENT_PASSWORD, ENCRYPTION_PASSWORD,
mFullBackupRestoreObserverMock);
@@ -662,7 +671,7 @@
@Test
public void getCurrentTransportForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.getCurrentTransport(mUserId)).thenReturn(TRANSPORT_NAME);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(TRANSPORT_NAME, mTrampoline.getCurrentTransportForUser(mUserId));
verify(mBackupManagerServiceMock).getCurrentTransport(mUserId);
@@ -672,7 +681,7 @@
public void getCurrentTransport_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
when(mBackupManagerServiceMock.getCurrentTransport(mUserId)).thenReturn(TRANSPORT_NAME);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(TRANSPORT_NAME, mTrampoline.getCurrentTransport());
verify(mBackupManagerServiceMock).getCurrentTransport(mUserId);
@@ -687,7 +696,7 @@
@Test
public void listAllTransportsForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.listAllTransports(mUserId)).thenReturn(TRANSPORTS);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(TRANSPORTS, mTrampoline.listAllTransportsForUser(mUserId));
verify(mBackupManagerServiceMock).listAllTransports(mUserId);
@@ -698,7 +707,7 @@
public void listAllTransports_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
when(mBackupManagerServiceMock.listAllTransports(mUserId)).thenReturn(TRANSPORTS);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(TRANSPORTS, mTrampoline.listAllTransports());
verify(mBackupManagerServiceMock).listAllTransports(mUserId);
@@ -715,7 +724,7 @@
public void listAllTransportComponentsForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.listAllTransportComponents(mUserId)).thenReturn(
TRANSPORT_COMPONENTS);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(TRANSPORT_COMPONENTS, mTrampoline.listAllTransportComponentsForUser(mUserId));
verify(mBackupManagerServiceMock).listAllTransportComponents(mUserId);
@@ -730,8 +739,8 @@
@Test
public void getTransportWhitelist_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.getTransportWhitelist()).thenReturn(TRANSPORTS);
+ mTrampoline.initializeService();
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
assertEquals(TRANSPORTS, mTrampoline.getTransportWhitelist());
verify(mBackupManagerServiceMock).getTransportWhitelist();
}
@@ -754,7 +763,7 @@
@Test
public void updateTransportAttributesForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.getTransportWhitelist()).thenReturn(TRANSPORTS);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.updateTransportAttributesForUser(
mUserId,
@@ -784,7 +793,7 @@
@Test
public void selectBackupTransportForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.selectBackupTransportForUser(mUserId, TRANSPORT_NAME);
@@ -794,7 +803,7 @@
@Test
public void selectBackupTransport_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.selectBackupTransport(TRANSPORT_NAME);
@@ -870,7 +879,7 @@
@Test
public void selectBackupTransportAsyncForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.selectBackupTransportAsyncForUser(mUserId, TRANSPORT_COMPONENT_NAME, null);
@@ -889,7 +898,7 @@
Intent configurationIntentStub = new Intent();
when(mBackupManagerServiceMock.getConfigurationIntent(mUserId, TRANSPORT_NAME)).thenReturn(
configurationIntentStub);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(
configurationIntentStub,
@@ -903,7 +912,7 @@
Intent configurationIntentStub = new Intent();
when(mBackupManagerServiceMock.getConfigurationIntent(mUserId, TRANSPORT_NAME)).thenReturn(
configurationIntentStub);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(configurationIntentStub, mTrampoline.getConfigurationIntent(TRANSPORT_NAME));
verify(mBackupManagerServiceMock).getConfigurationIntent(mUserId, TRANSPORT_NAME);
@@ -919,7 +928,7 @@
public void getDestinationStringForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.getDestinationString(mUserId, TRANSPORT_NAME)).thenReturn(
DESTINATION_STRING);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(
DESTINATION_STRING,
@@ -933,7 +942,7 @@
when(mBackupManagerServiceMock.getDestinationString(mUserId, TRANSPORT_NAME)).thenReturn(
DESTINATION_STRING);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(DESTINATION_STRING, mTrampoline.getDestinationString(TRANSPORT_NAME));
verify(mBackupManagerServiceMock).getDestinationString(mUserId, TRANSPORT_NAME);
}
@@ -949,7 +958,7 @@
Intent dataManagementIntent = new Intent();
when(mBackupManagerServiceMock.getDataManagementIntent(mUserId, TRANSPORT_NAME)).thenReturn(
dataManagementIntent);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(
dataManagementIntent,
@@ -963,7 +972,7 @@
Intent dataManagementIntent = new Intent();
when(mBackupManagerServiceMock.getDataManagementIntent(mUserId, TRANSPORT_NAME)).thenReturn(
dataManagementIntent);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(dataManagementIntent, mTrampoline.getDataManagementIntent(TRANSPORT_NAME));
verify(mBackupManagerServiceMock).getDataManagementIntent(mUserId, TRANSPORT_NAME);
@@ -979,7 +988,7 @@
public void getDataManagementLabelForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.getDataManagementLabel(mUserId, TRANSPORT_NAME)).thenReturn(
DATA_MANAGEMENT_LABEL);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(
DATA_MANAGEMENT_LABEL,
@@ -992,7 +1001,7 @@
TrampolineTestable.sCallingUserId = mUserId;
when(mBackupManagerServiceMock.getDataManagementLabel(mUserId, TRANSPORT_NAME)).thenReturn(
DATA_MANAGEMENT_LABEL);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(DATA_MANAGEMENT_LABEL, mTrampoline.getDataManagementLabel(TRANSPORT_NAME));
verify(mBackupManagerServiceMock).getDataManagementLabel(mUserId, TRANSPORT_NAME);
@@ -1006,7 +1015,7 @@
@Test
public void beginRestoreSessionForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.beginRestoreSessionForUser(mUserId, PACKAGE_NAME, TRANSPORT_NAME);
@@ -1023,7 +1032,7 @@
@Test
public void opComplete_forwarded() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.opComplete(1, 2);
@@ -1041,7 +1050,7 @@
public void getAvailableRestoreTokenForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.getAvailableRestoreToken(mUserId, PACKAGE_NAME))
.thenReturn(123L);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(123, mTrampoline.getAvailableRestoreTokenForUser(mUserId, PACKAGE_NAME));
verify(mBackupManagerServiceMock).getAvailableRestoreToken(mUserId, PACKAGE_NAME);
@@ -1058,7 +1067,7 @@
public void isAppEligibleForBackupForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.isAppEligibleForBackup(mUserId, PACKAGE_NAME))
.thenReturn(true);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertTrue(mTrampoline.isAppEligibleForBackupForUser(mUserId, PACKAGE_NAME));
verify(mBackupManagerServiceMock).isAppEligibleForBackup(mUserId, PACKAGE_NAME);
@@ -1075,7 +1084,7 @@
public void requestBackupForUser_forwarded() throws RemoteException {
when(mBackupManagerServiceMock.requestBackup(mUserId, PACKAGE_NAMES,
mBackupObserverMock, mBackupManagerMonitorMock, 123)).thenReturn(456);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(456, mTrampoline.requestBackupForUser(mUserId, PACKAGE_NAMES,
mBackupObserverMock, mBackupManagerMonitorMock, 123));
@@ -1088,7 +1097,7 @@
TrampolineTestable.sCallingUserId = mUserId;
when(mBackupManagerServiceMock.requestBackup(NON_USER_SYSTEM, PACKAGE_NAMES,
mBackupObserverMock, mBackupManagerMonitorMock, 123)).thenReturn(456);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertEquals(456, mTrampoline.requestBackup(PACKAGE_NAMES,
mBackupObserverMock, mBackupManagerMonitorMock, 123));
@@ -1104,7 +1113,7 @@
@Test
public void cancelBackupsForUser_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.cancelBackupsForUser(mUserId);
@@ -1114,7 +1123,7 @@
@Test
public void cancelBackups_forwardedToCallingUserId() throws RemoteException {
TrampolineTestable.sCallingUserId = mUserId;
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.cancelBackups();
@@ -1132,7 +1141,7 @@
FullBackupJob fullBackupJob = new FullBackupJob();
when(mBackupManagerServiceMock.beginFullBackup(fullBackupJob)).thenReturn(true);
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
assertTrue(mTrampoline.beginFullBackup(fullBackupJob));
verify(mBackupManagerServiceMock).beginFullBackup(fullBackupJob);
}
@@ -1145,7 +1154,7 @@
@Test
public void endFullBackup_forwarded() throws RemoteException {
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.endFullBackup();
verify(mBackupManagerServiceMock).endFullBackup();
}
@@ -1155,8 +1164,7 @@
when(mContextMock.checkCallingOrSelfPermission(
android.Manifest.permission.DUMP)).thenReturn(
PackageManager.PERMISSION_DENIED);
-
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.dump(mFileDescriptorStub, mPrintWriterMock, new String[0]);
@@ -1179,8 +1187,7 @@
when(mContextMock.checkCallingOrSelfPermission(
android.Manifest.permission.DUMP)).thenReturn(
PackageManager.PERMISSION_GRANTED);
-
- mTrampoline.initializeService(UserHandle.USER_SYSTEM);
+ mTrampoline.initializeService();
mTrampoline.dump(mFileDescriptorStub, mPrintWriterMock, null);