Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 27325 into eclair

Browse Source 
* changes:
  Don't forget to clear "backup in progress" state when finishing a pass
This commit is contained in:
Android (Google) Code Review
2009-09-27 18:58:27 -04:00
parent fdda2746d8 a253f16cf8
commit 5fbbdf2a21
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();
}
}