diff options
author | Dianne Hackborn <hackbod@google.com> | 2012-10-02 15:29:06 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2012-10-02 15:29:06 -0700 |
commit | 4a9f071f3d3fdd20615167cda6f22da912bc60c7 (patch) | |
tree | 37b20a219d32fc71c0cbebcfbff37579a17ce646 | |
parent | 11d8481f10a12caef0cfd9be7fe86e61d953d58f (diff) | |
download | frameworks_base-4a9f071f3d3fdd20615167cda6f22da912bc60c7.zip frameworks_base-4a9f071f3d3fdd20615167cda6f22da912bc60c7.tar.gz frameworks_base-4a9f071f3d3fdd20615167cda6f22da912bc60c7.tar.bz2 |
Fix issue #7272775: Auto Start Apps Not Starting
Bad defaults were causing stopped state to be set at each
boot.
Change-Id: I49b04e9c62f6ac391054201b508fddb6c7985615
-rw-r--r-- | core/java/android/content/pm/PackageUserState.java | 8 | ||||
-rw-r--r-- | services/java/com/android/server/pm/PackageSettingBase.java | 8 |
2 files changed, 3 insertions, 13 deletions
diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java index 7b3d8cd..3579977 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<String> 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 6a363a8..ae1b213 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) { |