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

Commit d4556b3a authored by Anton Philippov's avatar Anton Philippov Committed by android-build-merger
Browse files

Merge "Merge "Call removeMessages() only for certain operations in... 

Merge "Merge "Call removeMessages() only for certain operations in BackupManagerService#handleCancel()" into oc-dev am: 52817757" into oc-dev-plus-aosp
am: 254d2512

Change-Id: I76640f881b58c03b73fda80ff2536eb2a966d5ab
parents d10acc1b 254d2512

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

+6 −2
Original line number Diff line number Diff line
@@ -2622,9 +2622,13 @@ public class BackupManagerService implements BackupManagerServiceInterface { 
                // Can't delete op from mCurrentOperations here. waitUntilOperationComplete may be

                // called after we receive cancel here. We need this op's state there.













                // Remove all pending timeout messages for this operation type.













                // Remove all pending timeout messages of types OP_TYPE_BACKUP_WAIT and













                // OP_TYPE_RESTORE_WAIT. On the other hand, OP_TYPE_BACKUP cannot time out and













                // doesn't require cancellation.













                if (op.type == OP_TYPE_BACKUP_WAIT || op.type == OP_TYPE_RESTORE_WAIT) {















                    mBackupHandler.removeMessages(getMessageIdForOperationType(op.type));















                }













            }















            mCurrentOpLock.notifyAll();















        }