Merge "Fix an NPE when cancelling full backup in BMS#endFullBackup()" into oc-dev (0d1b1a25) · Commits · e / os / android_frameworks_base

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