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

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

Browse Source 
am: 887544e100

Change-Id: I440be882264d8687d7b5e3de036e54bf91386d6d
This commit is contained in:
Adam Lesinski
2017-06-08 21:20:03 +00:00
committed by android-build-merger
parent f512d86f5b 887544e100
commit adca091fcd
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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