summaryrefslogtreecommitdiff
path: root/services/backup
diff options
context:
space:
mode:
authornathch <nathch@google.com>2020-01-14 23:55:15 +0000
committernathch <nathch@google.com>2020-01-14 23:55:15 +0000
commit6b19ce6f0b4ec54e41493345e17e698cc8e34b44 (patch)
treec4f6c7f0eb9aa72d85d2aec3f4fe0e367de3b6b2 /services/backup
parenteeb90fec267478176a07edfb7b2fc9a0f9ef4ce4 (diff)
Remove unnecessary synchronized block
The only two actions within the block are sending an intent and canceling a job none of which have anything to do with the queuelock Test: atest -v RunBackupFrameworksServicesRoboTests Test: atest -v CtsBackupTestCases Test: atest -v CtsBackupHostTestCases Bug: 136738613 Change-Id: Ieedb73edf6cd40792232b48a26613b497c87ba02
Diffstat (limited to 'services/backup')
-rw-r--r--services/backup/java/com/android/server/backup/UserBackupManagerService.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/services/backup/java/com/android/server/backup/UserBackupManagerService.java b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
index 7b95ab526b41..2c229b443f91 100644
--- a/services/backup/java/com/android/server/backup/UserBackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/UserBackupManagerService.java
@@ -2538,7 +2538,6 @@ public class UserBackupManagerService {
KeyValueBackupJob.schedule(mUserId, mContext, mConstants);
} else {
if (DEBUG) Slog.v(TAG, "Scheduling immediate backup pass");
- synchronized (mQueueLock) {
// Fire the intent that kicks off the whole shebang...
try {
mRunBackupIntent.send();
@@ -2546,10 +2545,8 @@ public class UserBackupManagerService {
// should never happen
Slog.e(TAG, "run-backup intent cancelled!");
}
-
// ...and cancel any pending scheduled job, because we've just superseded it
KeyValueBackupJob.cancel(mUserId, mContext);
- }
}
} finally {
Binder.restoreCallingIdentity(oldId);