From 3361f334d51a84b0a623b57589c9f57c4c6d4d81 Mon Sep 17 00:00:00 2001 From: Patrick Baumann Date: Thu, 23 Apr 2020 10:33:45 -0700 Subject: [PATCH] Parses package/provider with non-configuration strings Fixes: 153658673 Test: AppEnumerationTests Change-Id: I7fb09f2746f9ccf151d8675cc4ab1360eac1dcd6 --- .../android/content/pm/parsing/ParsingPackageUtils.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/java/android/content/pm/parsing/ParsingPackageUtils.java b/core/java/android/content/pm/parsing/ParsingPackageUtils.java index 88f4c31b82cc4..4e189796bc48b 100644 --- a/core/java/android/content/pm/parsing/ParsingPackageUtils.java +++ b/core/java/android/content/pm/parsing/ParsingPackageUtils.java @@ -1530,8 +1530,8 @@ public class ParsingPackageUtils { } else if (parser.getName().equals("package")) { final TypedArray sa = res.obtainAttributes(parser, R.styleable.AndroidManifestQueriesPackage); - final String packageName = sa.getString( - R.styleable.AndroidManifestQueriesPackage_name); + final String packageName = sa.getNonConfigurationString( + R.styleable.AndroidManifestQueriesPackage_name, 0); if (TextUtils.isEmpty(packageName)) { return input.error("Package name is missing from package tag."); } @@ -1540,8 +1540,8 @@ public class ParsingPackageUtils { final TypedArray sa = res.obtainAttributes(parser, R.styleable.AndroidManifestQueriesProvider); try { - final String authorities = - sa.getString(R.styleable.AndroidManifestQueriesProvider_authorities); + final String authorities = sa.getNonConfigurationString( + R.styleable.AndroidManifestQueriesProvider_authorities, 0); if (TextUtils.isEmpty(authorities)) { return input.error( PackageManager.INSTALL_PARSE_FAILED_MANIFEST_MALFORMED,