From eb4ab301e105bef5b93e13cdee6b78285e7aa496 Mon Sep 17 00:00:00 2001 From: Michal Karpinski Date: Mon, 6 Mar 2017 13:39:19 +0000 Subject: BackupManagerService#cancelBackups() releases mCurrentOpLock sooner Incoming operations don't have to block until all backup ops to be cancelled are handled. Test: make gts -j40 && gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.backup.BackupManagerHostTest Bug: 35767318 Change-Id: I1c6f7a1cfbfc18483311044a75e46cd4e8f9f4f3 --- .../java/com/android/server/backup/BackupManagerService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 6021bdc310c0..c26032ce1cf5 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2462,12 +2462,10 @@ public class BackupManagerService { operationsToCancel.add(token); } } - - for (Integer token : operationsToCancel) { - handleCancel(token, true /* cancelAll */); - } } - + for (Integer token : operationsToCancel) { + handleCancel(token, true /* cancelAll */); + } // We don't want the backup jobs to kick in any time soon. // Reschedules them to run in the distant future. KeyValueBackupJob.schedule(mContext, BUSY_BACKOFF_MIN_MILLIS); -- cgit v1.2.3-59-g8ed1b