summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2009-05-22 14:34:57 -0700
committerJean-Baptiste Queru <jbq@google.com>2009-05-22 14:35:33 -0700
commit4cf03d381b2dff908857fceff0bec445f8d44f36 (patch)
tree0a6c7061ac92b652729e255c2de3d3ca3f95064f /services
parent843ef36f7b96cc19ea7d2996b7c8661b41ec3452 (diff)
parent5d6d773fab559fdc12e553d60d789f3991ac552c (diff)
downloadframeworks_base-4cf03d381b2dff908857fceff0bec445f8d44f36.zip
frameworks_base-4cf03d381b2dff908857fceff0bec445f8d44f36.tar.gz
frameworks_base-4cf03d381b2dff908857fceff0bec445f8d44f36.tar.bz2
Reconcile cupcake history into donut
Merge commit '5d6d773fab559fdc12e553d60d789f3991ac552c' into HEAD
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/PackageManagerService.java1
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 4ee0c91..079f363 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) {