Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: 91a9d65e42

Change-Id: Ief1ab206a0eb71c9225c000148d0f0b3264a526b
This commit is contained in:
Todd Kennedy
2017-06-07 18:50:33 +00:00
committed by android-build-merger
parent dd0f409b16 91a9d65e42
commit 1581bb0b75
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/content/pm/PackageParser.java
View File

@@ -7000,6 +7000,7 @@ public class PackageParser {
return null; return null;
} }
if (!copyNeeded(flags, a.owner, state, a.metaData, userId)) { if (!copyNeeded(flags, a.owner, state, a.metaData, userId)) {
updateApplicationInfo(a.info.applicationInfo, flags, state);
return a.info; return a.info;
} }
// Make shallow copies so we can store the metadata safely // Make shallow copies so we can store the metadata safely
@@ -7088,6 +7089,7 @@ public class PackageParser {
return null; return null;
} }
if (!copyNeeded(flags, s.owner, state, s.metaData, userId)) { if (!copyNeeded(flags, s.owner, state, s.metaData, userId)) {
updateApplicationInfo(s.info.applicationInfo, flags, state);
return s.info; return s.info;
} }
// Make shallow copies so we can store the metadata safely // 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) if (!copyNeeded(flags, p.owner, state, p.metaData, userId)
&& ((flags & PackageManager.GET_URI_PERMISSION_PATTERNS) != 0 && ((flags & PackageManager.GET_URI_PERMISSION_PATTERNS) != 0
|| p.info.uriPermissionPatterns == null)) { || p.info.uriPermissionPatterns == null)) {
updateApplicationInfo(p.info.applicationInfo, flags, state);
return p.info; return p.info;
} }
// Make shallow copies so we can store the metadata safely // Make shallow copies so we can store the metadata safely