Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Better iteration over mCurrentOperations in cancelBackups"

Browse Source
This commit is contained in:
Shreyas Basarge
2017-02-16 16:42:55 +00:00
committed by Android (Google) Code Review
parent ba422045d7 0277db478d
commit ddc72dd32e
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -2400,14 +2400,19 @@ 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 */);
}
}
// We don't want the backup jobs to kick in any time soon.