Merge "Avoid adding FORWARD_LOCK flag to an updated system app"

        }

        // 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 ((parseFlags & PackageParser.PARSE_IS_SYSTEM_DIR) == 0) {

            if (ps != null && !ps.codePath.equals(ps.resourcePath)) {

                parseFlags |= PackageParser.PARSE_FORWARD_LOCK;

            }

        }

        String codePath = null;

        String resPath = null;