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

Commit 4b48d48a authored by Michal Karpinski's avatar Michal Karpinski Committed by android-build-merger
Browse files

Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev 

am: 0d1b1a25

Change-Id: Id2e6a870ff207eb25844ecbeca6b80630b2e0d28
parents 1f56ccf5 0d1b1a25

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

+6 −4
Original line number Diff line number Diff line
@@ -5666,14 +5666,16 @@ public class BackupManagerService { 
                PerformFullTransportBackupTask pftbt = null;

                synchronized (mQueueLock) {

                    if (mRunningFullBackupTask != null) {

                        if (DEBUG_SCHEDULING) {

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

                        }

                        pftbt = mRunningFullBackupTask;

                    }

                }

                if (pftbt != null) {

                    if (DEBUG_SCHEDULING) {

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

                    }

                    pftbt.handleCancel(true);

                }

            }

        };

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

    }