diff options
| author | Christopher Tate <ctate@google.com> | 2015-01-30 00:11:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-30 00:11:32 +0000 |
| commit | 7a361cef37cb836746e1957c9901e61674bf05a5 (patch) | |
| tree | b5d79c48a2c35c75be467178be24d34d9701c4f7 /services | |
| parent | 6ac612b864b86078d48db0361c96657e938392fb (diff) | |
| parent | b71ac193087dc768a25cebb0f06f0ccbb66e8ba9 (diff) | |
| download | frameworks_base-7a361cef37cb836746e1957c9901e61674bf05a5.zip frameworks_base-7a361cef37cb836746e1957c9901e61674bf05a5.tar.gz frameworks_base-7a361cef37cb836746e1957c9901e61674bf05a5.tar.bz2 | |
am b71ac193: Merge "Don\'t run full-data backups when backup is disabled" into lmp-mr1-dev
* commit 'b71ac193087dc768a25cebb0f06f0ccbb66e8ba9':
Don't run full-data backups when backup is disabled
Diffstat (limited to 'services')
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 289152b..c1e4994 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -382,6 +382,7 @@ public class BackupManagerService { // we're now good to go, so start the backup alarms if (MORE_DEBUG) Slog.d(TAG, "Now provisioned, so starting backups"); startBackupAlarmsLocked(FIRST_BACKUP_INTERVAL); + scheduleNextFullBackupJob(); } } } @@ -3853,6 +3854,16 @@ public class BackupManagerService { PackageInfo currentPackage; try { + if (!mEnabled || !mProvisioned) { + // Backups are globally disabled, so don't proceed. + if (DEBUG) { + Slog.i(TAG, "full backup requested but e=" + mEnabled + + " p=" + mProvisioned + "; ignoring"); + } + mUpdateSchedule = false; + return; + } + IBackupTransport transport = getTransport(mCurrentTransport); if (transport == null) { Slog.w(TAG, "Transport not present; full data backup not performed"); @@ -4150,6 +4161,17 @@ public class BackupManagerService { long now = System.currentTimeMillis(); FullBackupEntry entry = null; + if (!mEnabled || !mProvisioned) { + // Backups are globally disabled, so don't proceed. We also don't reschedule + // the job driving automatic backups; that job will be scheduled again when + // the user enables backup. + if (MORE_DEBUG) { + Slog.i(TAG, "beginFullBackup but e=" + mEnabled + + " p=" + mProvisioned + "; ignoring"); + } + return false; + } + if (DEBUG_SCHEDULING) { Slog.i(TAG, "Beginning scheduled full backup operation"); } |