commit c70fc4a32016f3f06aa80596a7d9b4e9614e78bc
author Christopher Tate <ctate@google.com> Tue Dec 02 00:18:43 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 02 00:18:44 2014 +0000
tree 71598800b9df0e77a33ce6bcc168fa6b2772fff9
parent f17024873b10dabed069e502030dd85d6257c0c4
parent a7e47d5d344674f4174919c4ac51e5b9c74b5802

Merge "Don't crash if a system restore fails before constructing the PMBA" into lmp-mr1-dev

services/backup/java/com/android/server/backup/BackupManagerService.java

diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 6c2681b..6b8b5b1 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -7664,7 +7664,7 @@
 
             // If this was a full-system restore, record the ancestral
             // dataset information
-            if (mIsSystemRestore) {
+            if (mIsSystemRestore && mPmAgent != null) {
                 mAncestralPackages = mPmAgent.getRestoredPackages();
                 mAncestralToken = mToken;
                 writeRestoreTokens();