diff options
author | Christopher Tate <ctate@android.com> | 2013-06-24 16:05:49 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-24 16:05:49 -0700 |
commit | 347182386c54fd4aa4478f35b712c230eb290468 (patch) | |
tree | f6b097970bfd438885f72d4faf8286570cb76fcb /services/java | |
parent | 5b3afe3a84cad94642360df01c39ebb2a3ee14ba (diff) | |
parent | 3e7d0344399ac2f607fddde32c1a5e54228a38f9 (diff) | |
download | frameworks_base-347182386c54fd4aa4478f35b712c230eb290468.zip frameworks_base-347182386c54fd4aa4478f35b712c230eb290468.tar.gz frameworks_base-347182386c54fd4aa4478f35b712c230eb290468.tar.bz2 |
am 3e7d0344: Merge "Avoid adding FORWARD_LOCK flag to an updated system app"
* commit '3e7d0344399ac2f607fddde32c1a5e54228a38f9':
Avoid adding FORWARD_LOCK flag to an updated system app
Diffstat (limited to 'services/java')
-rwxr-xr-x[-rw-r--r--] | services/java/com/android/server/pm/PackageManagerService.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/services/java/com/android/server/pm/PackageManagerService.java b/services/java/com/android/server/pm/PackageManagerService.java index 22ce284..8cdca1f 100644..100755 --- a/services/java/com/android/server/pm/PackageManagerService.java +++ b/services/java/com/android/server/pm/PackageManagerService.java @@ -3532,10 +3532,13 @@ public class PackageManagerService extends IPackageManager.Stub { } // The apk is forward locked (not public) if its code and resources - // are kept in different files. + // are kept in different files. (except for app in either system or + // vendor path). // TODO grab this value from PackageSettings - if (ps != null && !ps.codePath.equals(ps.resourcePath)) { - parseFlags |= PackageParser.PARSE_FORWARD_LOCK; + if ((parseFlags & PackageParser.PARSE_IS_SYSTEM_DIR) == 0) { + if (ps != null && !ps.codePath.equals(ps.resourcePath)) { + parseFlags |= PackageParser.PARSE_FORWARD_LOCK; + } } String codePath = null; |