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

Commit 1581bb0b authored by Todd Kennedy's avatar Todd Kennedy Committed by android-build-merger
Browse files

Merge "always adjust per-user application info" into oc-dev 

am: 91a9d65e

Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
parents dd0f409b 91a9d65e

core/java/android/content/pm/PackageParser.java

+3 −0
Original line number Diff line number Diff line
@@ -7000,6 +7000,7 @@ public class PackageParser { 
            return null;

        }

        if (!copyNeeded(flags, a.owner, state, a.metaData, userId)) {

            updateApplicationInfo(a.info.applicationInfo, flags, state);

            return a.info;

        }

        // Make shallow copies so we can store the metadata safely
@@ -7088,6 +7089,7 @@ public class PackageParser { 
            return null;

        }

        if (!copyNeeded(flags, s.owner, state, s.metaData, userId)) {

            updateApplicationInfo(s.info.applicationInfo, flags, state);

            return s.info;

        }

        // Make shallow copies so we can store the metadata safely
@@ -7183,6 +7185,7 @@ public class PackageParser { 
        if (!copyNeeded(flags, p.owner, state, p.metaData, userId)

                && ((flags & PackageManager.GET_URI_PERMISSION_PATTERNS) != 0

                        || p.info.uriPermissionPatterns == null)) {

            updateApplicationInfo(p.info.applicationInfo, flags, state);

            return p.info;

        }

        // Make shallow copies so we can store the metadata safely