diff options
3 files changed, 5 insertions, 5 deletions
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 b042c3024034..ff72476d4bf1 100644 --- a/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java +++ b/services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java @@ -397,7 +397,7 @@ public class FullRestoreEngine extends RestoreEngine { setUpPipes(); mAgent = mBackupManagerService.bindToAgentSynchronous(mTargetApp, FullBackup.KEY_VALUE_DATA_TOKEN.equals(info.domain) - ? ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL + ? ApplicationThreadConstants.BACKUP_MODE_RESTORE : ApplicationThreadConstants.BACKUP_MODE_RESTORE_FULL, mBackupEligibilityRules.getBackupDestination()); mAgentPackage = pkg; 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 1656b6f0ab9b..77990af50979 100644 --- a/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java +++ b/services/backup/java/com/android/server/backup/restore/PerformUnifiedRestoreTask.java @@ -677,7 +677,7 @@ public class PerformUnifiedRestoreTask implements BackupRestoreTask { // Good to go! Set up and bind the agent... mAgent = backupManagerService.bindToAgentSynchronous( mCurrentPackage.applicationInfo, - ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL, + ApplicationThreadConstants.BACKUP_MODE_RESTORE, mBackupEligibilityRules.getBackupDestination()); if (mAgent == null) { Slog.w(TAG, "Can't find backup agent for " + packageName); diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 81dc34611d02..1f80aec3d443 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -4603,8 +4603,7 @@ public class ActivityManagerService extends IActivityManager.Stub boolean isRestrictedBackupMode = false; if (backupTarget != null && backupTarget.appInfo.packageName.equals(processName)) { isRestrictedBackupMode = backupTarget.appInfo.uid >= FIRST_APPLICATION_UID - && ((backupTarget.backupMode == BackupRecord.RESTORE) - || (backupTarget.backupMode == BackupRecord.RESTORE_FULL) + && ((backupTarget.backupMode == BackupRecord.RESTORE_FULL) || (backupTarget.backupMode == BackupRecord.BACKUP_FULL)); } @@ -13394,7 +13393,8 @@ public class ActivityManagerService extends IActivityManager.Stub BackupRecord r = new BackupRecord(app, backupMode, targetUserId, backupDestination); ComponentName hostingName = - (backupMode == ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL) + (backupMode == ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL + || backupMode == ApplicationThreadConstants.BACKUP_MODE_RESTORE) ? new ComponentName(app.packageName, app.backupAgentName) : new ComponentName("android", "FullBackupAgent"); |