summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2011-04-12 15:34:42 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-04-12 15:34:42 -0700
commit2e3ede527d8a972795a49ffc7eef4ead391107ec (patch)
treef2678d126ac68d8b6e017c6e45ff186907286c4a /services
parent83b61471c39fc4d5afc9f56c3ed771a14c8ad194 (diff)
parent1d1b4893762c8daad2b31dc79cad2dbcc1b251d2 (diff)
downloadframeworks_base-2e3ede527d8a972795a49ffc7eef4ead391107ec.zip
frameworks_base-2e3ede527d8a972795a49ffc7eef4ead391107ec.tar.gz
frameworks_base-2e3ede527d8a972795a49ffc7eef4ead391107ec.tar.bz2
Merge "Updated system packages retain shared user"
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/pm/Settings.java13
1 files changed, 13 insertions, 0 deletions
diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java
index 11dde75..16b55c3 100644
--- a/services/java/com/android/server/pm/Settings.java
+++ b/services/java/com/android/server/pm/Settings.java
@@ -1336,6 +1336,19 @@ final class Settings {
}
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 = getUserIdLPr(disabledPs.userId);
+ if (id != null && id instanceof SharedUserSetting) {
+ disabledPs.sharedUser = (SharedUserSetting) id;
+ }
+ }
+
readStoppedLPw();
mReadMessages.append("Read completed successfully: " + mPackages.size() + " packages, "