summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Adam Lesinski <adamlesinski@google.com> 2017-06-08 21:14:02 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-06-08 21:14:09 +0000
commit887544e100d0678bba7668b18f206092b328de54 (patch)
treeb33b05c300a43031a783aa85332d3cbd1e0c5139
parent980582e555ec5acdf5b0c5905b0ff57d966027a9 (diff)
parent157be6ead89fc585f21c8fcdb3fa81ead7c78ebc (diff)
Merge "Revert "always adjust per-user application info"" into oc-dev
-rw-r--r--core/java/android/content/pm/PackageParser.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 5e5a6fca2ca3..9b0bab427478 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -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