Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f1bb3a0 authored by Christopher Tate's avatar Christopher Tate
Browse files

Fix NPE in platform restore 

Bug 16061451

Change-Id: I79d7913455886828a493a0c4ea850d259bfeeeab
parent 8d3cd2c8

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

+3 −3
Original line number Diff line number Diff line
@@ -6537,10 +6537,10 @@ if (MORE_DEBUG) Slog.v(TAG, " + got " + nRead + "; now wanting " + (size - soF 
                    }



                    // 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