summaryrefslogtreecommitdiffstats
path: root/services/java/com
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2011-01-11 11:46:19 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-11 11:46:19 -0800
commit2275cd48a23d042d3196ccddbc83afa1630d0a41 (patch)
tree5a67f559949e7b9b7fdecb0ae88d89dc4b601939 /services/java/com
parent530069031e177c53b1cc3d3e1bdbd44b8aaa0857 (diff)
parent97ef63ba1e4a2474b72d8e46b2b28b693b0328cc (diff)
downloadframeworks_base-2275cd48a23d042d3196ccddbc83afa1630d0a41.zip
frameworks_base-2275cd48a23d042d3196ccddbc83afa1630d0a41.tar.gz
frameworks_base-2275cd48a23d042d3196ccddbc83afa1630d0a41.tar.bz2
Merge "Copy user info from PackageSetting as well" into honeycomb
Diffstat (limited to 'services/java/com')
-rw-r--r--services/java/com/android/server/PackageManagerService.java8
1 files changed, 8 insertions, 0 deletions
diff --git a/services/java/com/android/server/PackageManagerService.java b/services/java/com/android/server/PackageManagerService.java
index 435a2a5..e323b3b 100644
--- a/services/java/com/android/server/PackageManagerService.java
+++ b/services/java/com/android/server/PackageManagerService.java
@@ -7926,6 +7926,14 @@ class PackageManagerService extends IPackageManager.Stub {
copyFrom(orig);
}
+ public void copyFrom(PackageSetting base) {
+ super.copyFrom((PackageSettingBase) base);
+
+ userId = base.userId;
+ sharedUser = base.sharedUser;
+ pkg = base.pkg;
+ }
+
@Override
public String toString() {
return "PackageSetting{"