From 94d7ddb4b503c89c350d06965aac4e9e1203206b Mon Sep 17 00:00:00 2001 From: Jeff Sharkey Date: Wed, 6 Mar 2013 15:02:12 -0800 Subject: Use enabled/enabledSetting from PackageParser. PackageParser.updateApplicationInfo() has already interpreted the various COMPONENT_ENABLED flags for us, no need to clobber them. Bug: 8331767 Change-Id: If1363c5651a2f0326ee60e92517cfc0e6f256699 --- services/java/com/android/server/pm/PackageManagerService.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index cfb0f3fe7cb7..51f001f655a7 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -1614,16 +1614,9 @@ public class PackageManagerService extends IPackageManager.Stub { } final GrantedPermissions gp = ps.sharedUser != null ? ps.sharedUser : ps; final PackageUserState state = ps.readUserState(userId); - pi = PackageParser.generatePackageInfo(p, gp.gids, flags, + return PackageParser.generatePackageInfo(p, gp.gids, flags, ps.firstInstallTime, ps.lastUpdateTime, gp.grantedPermissions, state, userId); - if (pi != null) { - pi.applicationInfo.enabledSetting = state.enabled; - pi.applicationInfo.enabled = - pi.applicationInfo.enabledSetting == COMPONENT_ENABLED_STATE_DEFAULT - || pi.applicationInfo.enabledSetting == COMPONENT_ENABLED_STATE_ENABLED; - } - return pi; } @Override -- cgit v1.2.3-59-g8ed1b