Merge "Fix issue #7272775: Auto Start Apps Not Starting" into jb-mr1-dev (5bc54bf3) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/PackageUserState.java

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -34,14 +34,6 @@ public class PackageUserState {
	public HashSet<String> enabledComponents;		public HashSet<String> enabledComponents;

	public PackageUserState() {		public PackageUserState() {
	this(true);
	}

	/** @hide */
	public PackageUserState(boolean isSystem) {
	if (!isSystem) {
	stopped = notLaunched = true;
	}
	installed = true;		installed = true;
	enabled = COMPONENT_ENABLED_STATE_DEFAULT;		enabled = COMPONENT_ENABLED_STATE_DEFAULT;
	}		}

services/java/com/android/server/pm/PackageSettingBase.java

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -65,8 +65,7 @@ class PackageSettingBase extends GrantedPermissions {
	boolean permissionsFixed;		boolean permissionsFixed;
	boolean haveGids;		boolean haveGids;

	private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState(false);		private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState();
	private static final PackageUserState DEFAULT_SYSTEM_USER_STATE = new PackageUserState(true);

	// Whether this package is currently stopped, thus can not be		// Whether this package is currently stopped, thus can not be
	// started until explicitly launched by the user.		// started until explicitly launched by the user.
	@@ -176,7 +175,7 @@ class PackageSettingBase extends GrantedPermissions {
	private PackageUserState modifyUserState(int userId) {		private PackageUserState modifyUserState(int userId) {
	PackageUserState state = userState.get(userId);		PackageUserState state = userState.get(userId);
	if (state == null) {		if (state == null) {
	state = new PackageUserState((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0);		state = new PackageUserState();
	userState.put(userId, state);		userState.put(userId, state);
	}		}
	return state;		return state;
	@@ -187,8 +186,7 @@ class PackageSettingBase extends GrantedPermissions {
	if (state != null) {		if (state != null) {
	return state;		return state;
	}		}
	return ((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0)		return DEFAULT_USER_STATE;
	? DEFAULT_SYSTEM_USER_STATE : DEFAULT_USER_STATE;
	}		}

	void setEnabled(int state, int userId) {		void setEnabled(int state, int userId) {