Skip to content

Commit 4a9f071

Browse files
author
Dianne Hackborn
committed
Fix issue #7272775: Auto Start Apps Not Starting
Bad defaults were causing stopped state to be set at each boot. Change-Id: I49b04e9c62f6ac391054201b508fddb6c7985615
1 parent 11d8481 commit 4a9f071

File tree

2 files changed

+3
-13
lines changed

2 files changed

+3
-13
lines changed

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,6 @@ public class PackageUserState {
3434
public HashSet<String> enabledComponents;
3535

3636
public PackageUserState() {
37-
this(true);
38-
}
39-
40-
/** @hide */
41-
public PackageUserState(boolean isSystem) {
42-
if (!isSystem) {
43-
stopped = notLaunched = true;
44-
}
4537
installed = true;
4638
enabled = COMPONENT_ENABLED_STATE_DEFAULT;
4739
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ class PackageSettingBase extends GrantedPermissions {
6565
boolean permissionsFixed;
6666
boolean haveGids;
6767

68-
private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState(false);
69-
private static final PackageUserState DEFAULT_SYSTEM_USER_STATE = new PackageUserState(true);
68+
private static final PackageUserState DEFAULT_USER_STATE = new PackageUserState();
7069

7170
// Whether this package is currently stopped, thus can not be
7271
// started until explicitly launched by the user.
@@ -176,7 +175,7 @@ public void copyFrom(PackageSettingBase base) {
176175
private PackageUserState modifyUserState(int userId) {
177176
PackageUserState state = userState.get(userId);
178177
if (state == null) {
179-
state = new PackageUserState((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0);
178+
state = new PackageUserState();
180179
userState.put(userId, state);
181180
}
182181
return state;
@@ -187,8 +186,7 @@ public PackageUserState readUserState(int userId) {
187186
if (state != null) {
188187
return state;
189188
}
190-
return ((pkgFlags&ApplicationInfo.FLAG_SYSTEM) != 0)
191-
? DEFAULT_SYSTEM_USER_STATE : DEFAULT_USER_STATE;
189+
return DEFAULT_USER_STATE;
192190
}
193191

194192
void setEnabled(int state, int userId) {

0 commit comments

Comments
 (0)