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

am 18dd9b94: Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev

Browse Source 
* commit '18dd9b94150bf8960314aa52f2f05e31fd9a7432':
  Use enabled/enabledSetting from PackageParser.
This commit is contained in:
Jeff Sharkey
2013-03-06 23:31:00 +00:00
committed by Android Git Automerger
parent 469007092f 18dd9b9415
commit 768c5c4d9d
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/pm/PackageManagerService.java
View File

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