Merge "Fix #62798589 : requestBackup() needs to check enable/provisioned state" (fd4b85ad) · Commits · e / os / android_frameworks_base

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

+12 −1

Original line number	Diff line number	Diff line
		@@ -2443,6 +2443,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);
		@@ -4829,7 +4840,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;

+11 −0

Original line number	Diff line number	Diff line
		@@ -1852,6 +1852,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);

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