Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b19ce6f authored by nathch's avatar nathch
Browse files

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
parent eeb90fec

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

+0 −3
Original line number Diff line number Diff line
@@ -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,11 +2545,9 @@ 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);

        }