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

Commit 8df612d0 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix TypedArray instance leak in ParsingPackageUtils." into main am: a6a9c47b 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3093560



Change-Id: I9209120212d5d9bb330c280c26f3b89ea3952f08
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f33930ab a6a9c47b

core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java

+9 −5
Original line number Diff line number Diff line
@@ -1911,12 +1911,16 @@ public class ParsingPackageUtils { 
            } else if (parser.getName().equals("package")) {

                final TypedArray sa = res.obtainAttributes(parser,

                        R.styleable.AndroidManifestQueriesPackage);

                try {

                    final String packageName = sa.getNonConfigurationString(

                            R.styleable.AndroidManifestQueriesPackage_name, 0);

                    if (TextUtils.isEmpty(packageName)) {

                        return input.error("Package name is missing from package tag.");

                    }

                    pkg.addQueriesPackage(packageName.intern());

                } finally {

                    sa.recycle();

                }

            } else if (parser.getName().equals("provider")) {

                final TypedArray sa = res.obtainAttributes(parser,

                        R.styleable.AndroidManifestQueriesProvider);