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
This commit is contained in:
Christopher Tate
2013-06-24 16:05:49 -07:00
committed by Android Git Automerger

View File

@@ -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;