Merge "Offload the mRunningFullBackupTask.handleCancel() call from the main...

    // The job scheduler says our constraints don't hold any more,

    // so tear down any ongoing backup task right away.

    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 -----