Reconcile cupcake history into donut

Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into HEAD

1 files changed, 1 insertions, 0 deletions

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 4ee0c91c54a6..079f363b5fc8 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -5644,6 +5644,7 @@ class PackageManagerService extends IPackageManager.Stub {
                 }
                 p = new PackageSetting(name, codePath, resourcePath, vc, pkgFlags);
                 p.setTimeStamp(codePath.lastModified());
+                p.sharedUser = sharedUser;
                 if (sharedUser != null) {
                     p.userId = sharedUser.userId;
                 } else if (MULTIPLE_APPLICATION_UIDS) {