Merge "Fix test failed of CtsBackupHostTestCases" into main

1 files changed, 3 insertions, 0 deletions

diff --git a/services/core/java/com/android/server/pm/InstallPackageHelper.java b/services/core/java/com/android/server/pm/InstallPackageHelper.java
index b043d13f9da0..8eb5b6f11cb2 100644
--- a/services/core/java/com/android/server/pm/InstallPackageHelper.java
+++ b/services/core/java/com/android/server/pm/InstallPackageHelper.java
@@ -863,6 +863,9 @@ final class InstallPackageHelper {
                 // restore if appropriate, then pass responsibility back to the
                 // Package Manager to run the post-install observer callbacks
                 // and broadcasts.
+                // Note: MUST close freezer before backup/restore, otherwise test
+                // of CtsBackupHostTestCases will fail.
+                request.closeFreezer();
                 doRestore = performBackupManagerRestore(userId, token, request);
             }