Merge "Parses package/provider with non-configuration strings" into rvc-dev... (080d0046) · Commits · e / os / android_frameworks_base

core/java/android/content/pm/parsing/ParsingPackageUtils.java

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1530,8 +1530,8 @@ public class ParsingPackageUtils {
	} else if (parser.getName().equals("package")) {		} else if (parser.getName().equals("package")) {
	final TypedArray sa = res.obtainAttributes(parser,		final TypedArray sa = res.obtainAttributes(parser,
	R.styleable.AndroidManifestQueriesPackage);		R.styleable.AndroidManifestQueriesPackage);
	final String packageName = sa.getString(		final String packageName = sa.getNonConfigurationString(
	R.styleable.AndroidManifestQueriesPackage_name);		R.styleable.AndroidManifestQueriesPackage_name, 0);
	if (TextUtils.isEmpty(packageName)) {		if (TextUtils.isEmpty(packageName)) {
	return input.error("Package name is missing from package tag.");		return input.error("Package name is missing from package tag.");
	}		}
	@@ -1540,8 +1540,8 @@ public class ParsingPackageUtils {
	final TypedArray sa = res.obtainAttributes(parser,		final TypedArray sa = res.obtainAttributes(parser,
	R.styleable.AndroidManifestQueriesProvider);		R.styleable.AndroidManifestQueriesProvider);
	try {		try {
	final String authorities =		final String authorities = sa.getNonConfigurationString(
	sa.getString(R.styleable.AndroidManifestQueriesProvider_authorities);		R.styleable.AndroidManifestQueriesProvider_authorities, 0);
	if (TextUtils.isEmpty(authorities)) {		if (TextUtils.isEmpty(authorities)) {
	return input.error(		return input.error(
	PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,		PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,