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

* commit 'c70fc4a32016f3f06aa80596a7d9b4e9614e78bc': Don't crash if a system restore fails before constructing the PMBA
2014-12-02 00:24:03 +00:00
parent 1d22f99da9 c70fc4a320
commit 4bdf266c03
1 changed files with 1 additions and 1 deletions
--- 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 (MORE_DEBUG) Slog.v(TAG, "   + got " + nRead + "; now wanting " + (size - soF

            // If this was a full-system restore, record the ancestral
            // dataset information
-            if (mIsSystemRestore) {
+            if (mIsSystemRestore && mPmAgent != null) {
                mAncestralPackages = mPmAgent.getRestoredPackages();
                mAncestralToken = mToken;
                writeRestoreTokens();