Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 0d1b1a253a

Change-Id: Id2e6a870ff207eb25844ecbeca6b80630b2e0d28
This commit is contained in:
Michal Karpinski
2017-06-27 20:46:55 +00:00
committed by android-build-merger
parent 1f56ccf5f0 0d1b1a253a
commit 4b48d48a19
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/backup/java/com/android/server/backup/BackupManagerService.java
View File

@@ -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();