From 2d096ee435182f11e2d1d78b4ec015bcdbad4945 Mon Sep 17 00:00:00 2001
From: Shreyas Basarge <snb@google.com>
Date: Thu, 16 Feb 2017 14:54:47 +0000
Subject: [PATCH] Fix NPE in BackupManagerService

If none of the requested packages are valid packages,
we'd run into this issue where PerformBackupTask#mQueue
is null but we try to iterate over it in finalizeBackup()
Fix is to use an empty queue as the default value instead
of null.

Bug: 35380067
Test: Manually tested by trying to backup a non-existent package.
Change-Id: Ibb2d03d5f8270bcb448ee083ee02964236aca92b
---
 .../java/com/android/server/backup/BackupManagerService.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 13e6ae04d8585..af718063a2334 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -2607,6 +2607,7 @@ public class BackupManagerService {
                 boolean userInitiated, boolean nonIncremental) {
             mTransport = transport;
             mOriginalQueue = queue;
+            mQueue = new ArrayList<>();
             mJournal = journal;
             mObserver = observer;
             mMonitor = monitor;