Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a30fcd9 authored by Christopher Tate's avatar Christopher Tate
Browse files

Fix #62798589 : requestBackup() needs to check enable/provisioned state 

Also tweaked the logging to make sure to capture "not provisioned"
whenever it's the case.

Test: manual
Change-Id: Iee909b8336af776bad0fa46f036d6cf32ef9c3e7
parent 101ba665

services/backup/java/com/android/server/backup/BackupManagerService.java

+12 −1
Original line number Diff line number Diff line
@@ -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;

































services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java



+11
−0




























Original line number
Diff line number
Diff line








@@ -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);

































services/backup/java/com/android/server/backup/fullbackup/PerformFullTransportBackupTask.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -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;