diff options
| author | Michal Karpinski <mkarpinski@google.com> | 2017-06-27 15:08:57 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-06-27 22:36:00 +0000 |
| commit | d3e4d4f2564a322a421466ec9e9dcace2dd2ad2b (patch) | |
| tree | 8b5b5d48fb7e0c0b47a99936e3585dff33c792b9 | |
| parent | 5e592b4a365feba1b196ae11ce2a581c6da66a29 (diff) | |
| download | base-d3e4d4f2564a322a421466ec9e9dcace2dd2ad2b.tar.gz | |
Fix an NPE when cancelling full backup in BMS#endFullBackup()
Bug: 63000171
Test: it's just a nullcheck that compiles
Change-Id: I90faa5577f2fd656bb4f7b6af39494590a77e3bf
(cherry picked from commit 077d6371931dcefeb882a694524753c24bed3313)
| -rw-r--r-- | services/backup/java/com/android/server/backup/BackupManagerService.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 30de4baf3460..6f6e1b721487 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -5666,13 +5666,15 @@ public class BackupManagerService { PerformFullTransportBackupTask pftbt = null; synchronized (mQueueLock) { if (mRunningFullBackupTask != null) { - if (DEBUG_SCHEDULING) { - Slog.i(TAG, "Telling running backup to stop"); - } pftbt = mRunningFullBackupTask; } } - pftbt.handleCancel(true); + if (pftbt != null) { + if (DEBUG_SCHEDULING) { + Slog.i(TAG, "Telling running backup to stop"); + } + pftbt.handleCancel(true); + } } }; new Thread(endFullBackupRunnable, "end-full-backup").start(); |