Merge "[RefactoredBMS] Offload the mRunningFullBackupTask.handleCancel() call... (676b3d2b) · Commits · e / os / android_frameworks_base

services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java

+18 −6

Original line number	Diff line number	Diff line
		@@ -2119,14 +2119,26 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter
		// so tear down any ongoing backup task right away.
		@Override
		public void endFullBackup() {
		// offload the mRunningFullBackupTask.handleCancel() call to another thread,
		// as we might have to wait for mCancelLock
		Runnable endFullBackupRunnable = new Runnable() {
		@Override
		public void run() {
		PerformFullTransportBackupTask pftbt = null;
		synchronized (mQueueLock) {
		if (mRunningFullBackupTask != null) {
		pftbt = mRunningFullBackupTask;
		}
		}
		if (pftbt != null) {
		if (DEBUG_SCHEDULING) {
		Slog.i(TAG, "Telling running backup to stop");
		}
		mRunningFullBackupTask.handleCancel(true);
		pftbt.handleCancel(true);
		}
		}
		};
		new Thread(endFullBackupRunnable, "end-full-backup").start();
		}

		// Used by both incremental and full restore