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

Commit eb4ab301 authored by Michal Karpinski's avatar Michal Karpinski
Browse files

BackupManagerService#cancelBackups() releases mCurrentOpLock sooner 

Incoming operations don't have to block until all backup ops to be
cancelled are handled.

Test: make gts -j40 && gts-tradefed run gts -m GtsGmscoreHostTestCases -t com.google.android.gts.backup.BackupManagerHostTest
Bug: 35767318
Change-Id: I1c6f7a1cfbfc18483311044a75e46cd4e8f9f4f3
parent e1be1dfb

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

+3 −5
Original line number Diff line number Diff line
@@ -2462,12 +2462,10 @@ public class BackupManagerService { 
                        operationsToCancel.add(token);

                    }

                }



            }

            for (Integer token : operationsToCancel) {

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

            }

            }



            // We don't want the backup jobs to kick in any time soon.

            // Reschedules them to run in the distant future.

            KeyValueBackupJob.schedule(mContext, BUSY_BACKOFF_MIN_MILLIS);