diff options
| -rwxr-xr-x | services/java/com/android/server/pm/PackageManagerService.java | 3 | ||||
| -rw-r--r-- | services/java/com/android/server/pm/Settings.java | 13 |
2 files changed, 16 insertions, 0 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 39fc4ad..7cc568e 100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -1349,6 +1349,9 @@ public class PackageManagerService extends IPackageManager.Stub { //delete tmp files deleteTempPackageFiles(); + // Remove any shared userIDs that have no associated packages + mSettings.pruneSharedUsersLPw(); + if (!mOnlyCore) { EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_PMS_DATA_SCAN_START, SystemClock.uptimeMillis()); diff --git a/services/java/com/android/server/pm/Settings.java b/services/java/com/android/server/pm/Settings.java index 92026b2..8e0c92a 100644 --- a/services/java/com/android/server/pm/Settings.java +++ b/services/java/com/android/server/pm/Settings.java @@ -351,6 +351,19 @@ final class Settings { return null; } + void pruneSharedUsersLPw() { + ArrayList<String> removeStage = new ArrayList<String>(); + for (Map.Entry<String,SharedUserSetting> entry : mSharedUsers.entrySet()) { + final SharedUserSetting sus = entry.getValue(); + if (sus == null || sus.packages.size() == 0) { + removeStage.add(entry.getKey()); + } + } + for (int i = 0; i < removeStage.size(); i++) { + mSharedUsers.remove(removeStage.get(i)); + } + } + // Transfer ownership of permissions from one package to another. void transferPermissionsLPw(String origPkg, String newPkg) { // Transfer ownership of permissions to the new package. |