Merge "Don't hold the backup queue lock across a backup operation" (cb14ec13) · Commits · e / os / android_frameworks_base

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

+16 −11

Original line number	Diff line number	Diff line
		@@ -258,8 +258,11 @@ class BackupManagerService extends IBackupManager.Stub {

		// snapshot the pending-backup set and work on that
		ArrayList<BackupRequest> queue = new ArrayList<BackupRequest>();
		File oldJournal = mJournal;
		synchronized (mQueueLock) {
		// Do we have any work to do?
		// Do we have any work to do? Construct the work queue
		// then release the synchronization lock to actually run
		// the backup.
		if (mPendingBackups.size() > 0) {
		for (BackupRequest b: mPendingBackups.values()) {
		queue.add(b);
		@@ -268,9 +271,12 @@ class BackupManagerService extends IBackupManager.Stub {
		mPendingBackups.clear();

		// Start a new backup-queue journal file too
		File oldJournal = mJournal;
		mJournal = null;

		}
		}

		if (queue.size() > 0) {
		// At this point, we have started a new journal file, and the old
		// file identity is being passed to the backup processing thread.
		// When it completes successfully, that old journal file will be
		@@ -281,7 +287,6 @@ class BackupManagerService extends IBackupManager.Stub {
		Log.v(TAG, "Backup requested but nothing pending");
		mWakelock.release();
		}
		}
		break;
		}