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

am 5fbbdf2a: Merge change 27325 into eclair

Browse Source 
Merge commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7' into eclair-plus-aosp

* commit '5fbbdf2a21e5d41a3eaaa7122f4a46d30f81f7f7':
  Don't forget to clear "backup in progress" state when finishing a pass
This commit is contained in:
Christopher Tate
2009-09-27 16:54:22 -07:00
committed by Android Git Automerger
parent fcc381b174 5fbbdf2a21
commit dd205d1446
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); IBackupTransport transport = getTransport(mCurrentTransport);
if (transport == null) { if (transport == null) {
Log.v(TAG, "Backup requested but no transport available"); Log.v(TAG, "Backup requested but no transport available");
synchronized (mQueueLock) {
mBackupOrRestoreInProgress = false;
}
mWakelock.release(); mWakelock.release();
break; break;
} }
@@ -671,6 +674,9 @@ class BackupManagerService extends IBackupManager.Stub {
(new PerformBackupThread(transport, queue, oldJournal)).start(); (new PerformBackupThread(transport, queue, oldJournal)).start();
} else { } else {
Log.v(TAG, "Backup requested but nothing pending"); Log.v(TAG, "Backup requested but nothing pending");
synchronized (mQueueLock) {
mBackupOrRestoreInProgress = false;
}
mWakelock.release(); mWakelock.release();
} }
} }
@@ -1686,6 +1692,9 @@ class BackupManagerService extends IBackupManager.Stub {
} }
// Last but not least, release the cpu // Last but not least, release the cpu
synchronized (mQueueLock) {
mBackupOrRestoreInProgress = false;
}
mWakelock.release(); mWakelock.release();
} }
} }