summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorAdam Lesinski <adamlesinski@google.com>2017-06-08 21:25:24 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-06-08 21:25:24 +0000
commit21983b0293d4dde8495c497a0191c21244a27ebf (patch)
tree7513f59708bdd3895a4444dcb59a733259bf1ec9 /core/java
parentcc26dbbb460b2fa58eea9bc18beef2ca0932f4bc (diff)
parentadca091fcd3c6141c4364afc854db1b9a9583bdd (diff)
Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100
am: adca091fcd Change-Id: I49afd37a236925b59ac84fe4b620e2a93baf0686
Diffstat (limited to 'core/java')
-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