Merge "Fix NPE in platform restore"
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index b31a3d6..5bfde4d 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -6537,10 +6537,10 @@
}
// Pull the Package Manager metadata from the restore set first
- PackageInfo omPackage = new PackageInfo();
- omPackage.packageName = PACKAGE_MANAGER_SENTINEL;
+ mCurrentPackage = new PackageInfo();
+ mCurrentPackage.packageName = PACKAGE_MANAGER_SENTINEL;
mPmAgent = new PackageManagerBackupAgent(mPackageManager, null);
- initiateOneRestore(omPackage, 0,
+ initiateOneRestore(mCurrentPackage, 0,
IBackupAgent.Stub.asInterface(mPmAgent.onBind()));
// The PM agent called operationComplete() already, because our invocation
// of it is process-local and therefore synchronous. That means that a