drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't forget to clear "backup in progress" state when finishing a pass

Browse Source 
If a backup pass had been skipped (either because the transport was unavailable
or -- in a common case! -- because there was simply no work pending when the
periodic backup check fired), we were forgetting to reset the "backup currently
in progress" flag.  Once we'd done that, the device would *NEVER* perform a
backup until it was rebooted, since it would forever think that there was one
currently in operation that must not be interfered with.

Change-Id: I0d6d7375dc6de99b599222a449934e70fe13ebb9
This commit is contained in:
Christopher Tate
2009-09-27 15:16:44 -07:00
parent e7d60bfdff
commit a253f16cf8
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/BackupManagerService.java
View File

@ -637,6 +637,9 @@ class BackupManagerService extends IBackupManager.Stub {
IBackupTransport transport = getTransport(mCurrentTransport);
if (transport == null) {
Log.v(TAG, "Backup requested but no transport available");
synchronized (mQueueLock) {
mBackupOrRestoreInProgress = false;
}
mWakelock.release();
break;
}
@ -671,6 +674,9 @@ class BackupManagerService extends IBackupManager.Stub {
(new PerformBackupThread(transport, queue, oldJournal)).start();
} else {
Log.v(TAG, "Backup requested but nothing pending");
synchronized (mQueueLock) {
mBackupOrRestoreInProgress = false;
}
mWakelock.release();
}
}
@ -1686,6 +1692,9 @@ class BackupManagerService extends IBackupManager.Stub {
}
// Last but not least, release the cpu
synchronized (mQueueLock) {
mBackupOrRestoreInProgress = false;
}
mWakelock.release();
}
}