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

Commit 14f57541 authored by Michal Karpinski's avatar Michal Karpinski
Browse files

resolve merge conflicts of 970525ef to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ia4860b81fbd1f45e6594197b1de75ff3531c4826
parents 058a73e7 970525ef

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

+16 −6
Original line number Diff line number Diff line
@@ -5641,14 +5641,24 @@ public class BackupManagerService implements BackupManagerServiceInterface { 
    // so tear down any ongoing backup task right away.

    @Override

    public void endFullBackup() {

        // offload the mRunningFullBackupTask.handleCancel() call to another thread,

        // as we might have to wait for mCancelLock

        Runnable endFullBackupRunnable = new Runnable() {

            @Override

            public void run() {

                PerformFullTransportBackupTask pftbt = null;

                synchronized (mQueueLock) {

                    if (mRunningFullBackupTask != null) {

                        if (DEBUG_SCHEDULING) {

                            Slog.i(TAG, "Telling running backup to stop");

                        }

                mRunningFullBackupTask.handleCancel(true);

                        pftbt = mRunningFullBackupTask;

                    }

                }

                pftbt.handleCancel(true);

            }

        };

        new Thread(endFullBackupRunnable, "end-full-backup").start();

    }















    // ----- Restore infrastructure -----