commit 2275cd48a23d042d3196ccddbc83afa1630d0a41
author Kenny Root <kroot@google.com> Tue Jan 11 11:46:19 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 11 11:46:19 2011 -0800
tree 5a67f559949e7b9b7fdecb0ae88d89dc4b601939
parent 530069031e177c53b1cc3d3e1bdbd44b8aaa0857
parent 97ef63ba1e4a2474b72d8e46b2b28b693b0328cc

Merge "Copy user info from PackageSetting as well" into honeycomb

services/java/com/android/server/PackageManagerService.java

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 @@
             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{"