Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue #7272775: Auto Start Apps Not Starting" into jb-mr1-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-10-02 16:25:14 -07:00
committed by Android (Google) Code Review
parent 3ed62adad1 4a9f071f3d
commit 5bc54bf354
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/content/pm/PackageUserState.java
View File

@@ -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;
}

8
services/java/com/android/server/pm/PackageSettingBase.java
View File

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