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 am: 0d1b1a253a

Browse Source 
am: 4b48d48a19

Change-Id: I6e35567cd376666fefb1e9356ce7325595507f77
This commit is contained in:
Michal Karpinski
2017-06-27 20:56:08 +00:00
committed by android-build-merger
parent 5b3c1af460 4b48d48a19
commit 2ceefbf767
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

@@ -5688,13 +5688,15 @@ public class BackupManagerService implements BackupManagerServiceInterface {
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();