diff options
3 files changed, 24 insertions, 2 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 4bfe10fdd8c5..ff39f1905390 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2457,6 +2457,17 @@ public class BackupManagerService implements BackupManagerServiceInterface { throw new IllegalArgumentException("No packages are provided for backup"); } + if (!mEnabled || !mProvisioned) { + Slog.i(TAG, "Backup requested but e=" + mEnabled + " p=" +mProvisioned); + sendBackupFinished(observer, BackupManager.ERROR_BACKUP_NOT_ALLOWED); + final int logTag = mProvisioned + ? BackupManagerMonitor.LOG_EVENT_ID_BACKUP_DISABLED + : BackupManagerMonitor.LOG_EVENT_ID_DEVICE_NOT_PROVISIONED; + monitor = monitorEvent(monitor, logTag, null, + BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY, null); + return BackupManager.ERROR_BACKUP_NOT_ALLOWED; + } + IBackupTransport transport = mTransportManager.getCurrentTransportBinder(); if (transport == null) { sendBackupFinished(observer, BackupManager.ERROR_TRANSPORT_ABORTED); @@ -4843,7 +4854,7 @@ public class BackupManagerService implements BackupManagerServiceInterface { + " provisioned=" + mProvisioned + "; ignoring"); } int monitoringEvent; - if (!mEnabled) { + if (mProvisioned) { monitoringEvent = BackupManagerMonitor.LOG_EVENT_ID_BACKUP_DISABLED; } else { monitoringEvent = BackupManagerMonitor.LOG_EVENT_ID_DEVICE_NOT_PROVISIONED; diff --git a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java index b57c0bc964b4..16a562f9c256 100644 --- a/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java +++ b/services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java @@ -1851,6 +1851,17 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter throw new IllegalArgumentException("No packages are provided for backup"); } + if (!mEnabled || !mProvisioned) { + Slog.i(TAG, "Backup requested but e=" + mEnabled + " p=" +mProvisioned); + BackupObserverUtils.sendBackupFinished(observer, BackupManager.ERROR_BACKUP_NOT_ALLOWED); + final int logTag = mProvisioned + ? BackupManagerMonitor.LOG_EVENT_ID_BACKUP_DISABLED + : BackupManagerMonitor.LOG_EVENT_ID_DEVICE_NOT_PROVISIONED; + monitor = BackupManagerMonitorUtils.monitorEvent(monitor, logTag, null, + BackupManagerMonitor.LOG_EVENT_CATEGORY_BACKUP_MANAGER_POLICY, null); + return BackupManager.ERROR_BACKUP_NOT_ALLOWED; + } + IBackupTransport transport = mTransportManager.getCurrentTransportBinder(); if (transport == null) { BackupObserverUtils.sendBackupFinished(observer, BackupManager.ERROR_TRANSPORT_ABORTED); 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 0f1e48579a92..bc7c1174d17f 100644 --- a/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java +++ b/services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java @@ -277,7 +277,7 @@ public class PerformFullTransportBackupTask extends FullBackupTask implements Ba + "; ignoring"); } int monitoringEvent; - if (!backupManagerService.isEnabled()) { + if (backupManagerService.isProvisioned()) { monitoringEvent = BackupManagerMonitor.LOG_EVENT_ID_BACKUP_DISABLED; } else { monitoringEvent = BackupManagerMonitor.LOG_EVENT_ID_DEVICE_NOT_PROVISIONED; |