diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java index 7b3d8cda9455b..357997781eda0 100644 --- a/core/java/android/content/pm/PackageUserState.java +++ b/core/java/android/content/pm/PackageUserState.java @@ -34,14 +34,6 @@ public class PackageUserState { public HashSet enabledComponents; public PackageUserState() { - this(true); - } - - /** @hide */ - public PackageUserState(boolean isSystem) { - if (!isSystem) { - stopped = notLaunched = true; - } installed = true; enabled = COMPONENT_ENABLED_STATE_DEFAULT; } diff --git a/services/java/com/android/server/pm/PackageSettingBase.java b/services/java/com/android/server/pm/PackageSettingBase.java index 6a363a8c90553..ae1b2134907e0 100644 --- a/services/java/com/android/server/pm/PackageSettingBase.java +++ b/services/java/com/android/server/pm/PackageSettingBase.java @@ -65,8 +65,7 @@ class PackageSettingBase extends GrantedPermissions { boolean permissionsFixed; boolean haveGids; - private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState(false); - private static final PackageUserState DEFAULT_SYSTEM_USER_STATE = new PackageUserState(true); + private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState(); // Whether this package is currently stopped, thus can not be // started until explicitly launched by the user. @@ -176,7 +175,7 @@ class PackageSettingBase extends GrantedPermissions { private PackageUserState modifyUserState(int userId) { PackageUserState state = userState.get(userId); if (state == null) { - state = new PackageUserState((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0); + state = new PackageUserState(); userState.put(userId, state); } return state; @@ -187,8 +186,7 @@ class PackageSettingBase extends GrantedPermissions { if (state != null) { return state; } - return ((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0) - ? DEFAULT_SYSTEM_USER_STATE : DEFAULT_USER_STATE; + return DEFAULT_USER_STATE; } void setEnabled(int state, int userId) {