Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07cd3f3f authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

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

* commit '768c5c4d':
  Use enabled/enabledSetting from PackageParser.
parents d0da4c45 768c5c4d

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

+1 −8
Original line number Diff line number Diff line
@@ -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