diff options
| author | 2020-01-15 11:59:15 +0000 | |
|---|---|---|
| committer | 2020-01-15 11:59:15 +0000 | |
| commit | bcd1d7f68821de7263e3f244a3a63669bd339b23 (patch) | |
| tree | 5b5cb7e3a8622f8ae81691ba7cde2fdee87b5af7 | |
| parent | f7f94e34bfacb84e3cd0d61208248a8588c5117b (diff) | |
| parent | 6b19ce6f0b4ec54e41493345e17e698cc8e34b44 (diff) | |
Merge "Remove unnecessary synchronized block"
| -rw-r--r-- | services/backup/java/com/android/server/backup/UserBackupManagerService.java | 3 |
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); |