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

Commit 0277db47 authored by Shreyas Basarge's avatar Shreyas Basarge
Browse files

Better iteration over mCurrentOperations in cancelBackups 

handleCancel was being called on an operation
while we are iterating over all operations.
This can cause issues if handleCancel modifies
the array containing all operations.

Test: Run cancelBackup GTS tests.

Change-Id: If3fbe7b5d9e61aa870f8f6e0dd1654e735c0c5b8
parent 2c02bd1c

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

+6 −1
Original line number Diff line number Diff line
@@ -2400,13 +2400,18 @@ public class BackupManagerService { 
        }

        final long oldToken = Binder.clearCallingIdentity();

        try {

            List<Integer> operationsToCancel = new ArrayList<>();

            synchronized (mCurrentOpLock) {

                for (int i = 0; i < mCurrentOperations.size(); i++) {

                    Operation op = mCurrentOperations.valueAt(i);

                    int token = mCurrentOperations.keyAt(i);

                    if (op.type == OP_TYPE_BACKUP) {

                        handleCancel(token, true /* cancelAll */);

                        operationsToCancel.add(token);

                    }

                }



                for (Integer token : operationsToCancel) {

                    handleCancel(token, true /* cancelAll */);

                }

            }