summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-06-08 21:23:30 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-06-08 21:23:36 +0000
commitc2bc1f27906a7932165bb2a8bcc794051e032f89 (patch)
tree7dcaf783d5eb7c3a25b19ed78ba72248983761eb
parent3b852973e3835efa031fb39d8cc7bef14bff1aa4 (diff)
parent85731623244a0ab52c85468daf299e04017443bf (diff)
Merge "Merge "Revert "always adjust per-user application info"" into oc-dev am: 887544e100" into oc-dev-plus-aosp
-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