Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fcd312d8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Parses package/provider with non-configuration strings" into rvc-dev am: 9b896504 

Change-Id: Ib83d896a3f90ec95a333b03a7c07862c4fdbbb97
parents 8dd83556 9b896504

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

+4 −4
Original line number Diff line number Diff line
@@ -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,