diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-03-06 23:32:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-06 23:32:31 +0000 |
| commit | 07cd3f3f018a32860e183ccdf9253dcc37c630bb (patch) | |
| tree | 1f2e48933065626a7c50457823475d574f56ab8e | |
| parent | d0da4c45f3199d0e9c9813dd87328d73bf8bbf89 (diff) | |
| parent | 768c5c4d9d736c55d7ef580142d602850f47a098 (diff) | |
| download | frameworks_base-07cd3f3f018a32860e183ccdf9253dcc37c630bb.zip frameworks_base-07cd3f3f018a32860e183ccdf9253dcc37c630bb.tar.gz frameworks_base-07cd3f3f018a32860e183ccdf9253dcc37c630bb.tar.bz2 | |
am 768c5c4d: am 18dd9b94: Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev
* commit '768c5c4d9d736c55d7ef580142d602850f47a098':
Use enabled/enabledSetting from PackageParser.
| -rw-r--r-- | services/java/com/android/server/pm/PackageManagerService.java | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index e17b53e..b4987cb 100644 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -1618,16 +1618,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 |