Merge "Revert "always adjust per-user application info"" into oc-dev (85731623) · Commits · e / os / android_frameworks_base

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

+0 −3

Original line number	Diff line number	Diff line
		@@ -7000,7 +7000,6 @@ 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
		@@ -7089,7 +7088,6 @@ 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
		@@ -7185,7 +7183,6 @@ 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