commit a6a9c47bec6c99ae486d0c500e97290ce6f9e542
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri May 17 18:56:09 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri May 17 18:56:09 2024 +0000
tree 5c733ab7087be2d6af747b98a922f826ac0449d1
parent 9c6959affa8634e0994ad38cf4c3c737402cef9d
parent 83e67a66dec61cd195e6845df4a78b2437e281f6

Merge "Fix TypedArray instance leak in ParsingPackageUtils." into main

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

diff --git a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
index 9fc7ddb..0e5049e 100644
--- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
@@ -1911,12 +1911,16 @@
             } else if (parser.getName().equals("package")) {
                 final TypedArray sa = res.obtainAttributes(parser,
                         R.styleable.AndroidManifestQueriesPackage);
-                final String packageName = sa.getNonConfigurationString(
-                        R.styleable.AndroidManifestQueriesPackage_name, 0);
-                if (TextUtils.isEmpty(packageName)) {
-                    return input.error("Package name is missing from package tag.");
+                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();
                 }
-                pkg.addQueriesPackage(packageName.intern());
             } else if (parser.getName().equals("provider")) {
                 final TypedArray sa = res.obtainAttributes(parser,
                         R.styleable.AndroidManifestQueriesProvider);