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

Commit 94d7ddb4 authored by Jeff Sharkey's avatar Jeff Sharkey
Browse files

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
parent f6fcea60

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

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