From 4ec33c2aad59b2a745ee891c9b7246b9533d95e0 Mon Sep 17 00:00:00 2001
From: Dan Morrill <morrildl@google.com>
Date: Mon, 2 May 2011 16:58:35 -0700
Subject: [PATCH] Do not merge. Cherry-pick of
 Idc802af57fb9926a69ed52d4e776ef57d8b647c6 (package manager fix) to
 gingerbread.

Change-Id: Ia5373100e97bfe42d2211c6249996dc7ff4818e0
---
 .../com/android/server/PackageManagerService.java   | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 8c74566c231b4..19abdc3ce6ad9 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -9031,6 +9031,19 @@ class PackageManagerService extends IPackageManager.Stub {
             }
             mPendingPackages.clear();
 
+            /*
+             * Make sure all the updated system packages have their shared users
+             * associated with them.
+             */
+            final Iterator<PackageSetting> disabledIt = mDisabledSysPackages.values().iterator();
+            while (disabledIt.hasNext()) {
+                final PackageSetting disabledPs = disabledIt.next();
+                final Object id = getUserIdLP(disabledPs.userId);
+                if (id != null && id instanceof SharedUserSetting) {
+                  disabledPs.sharedUser = (SharedUserSetting) id;
+                }
+            }
+
             mReadMessages.append("Read completed successfully: "
                     + mPackages.size() + " packages, "
                     + mSharedUsers.size() + " shared uids\n");