commit 675a58b2ceee86a8301b201bc780940aac2b0231
author Lee Shombert <shombert@google.com> Mon Mar 02 21:52:38 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Mar 02 21:52:38 2020 +0000
tree 9adbf9c222284d76b7a56005bbc25aae51125080
parent fcfd7cf944d23b70ec2d3d1c63c279154e8b7d33
parent 1f771846c51148b7cb6283e6dc82a216ffaa5353

Merge "Fix a leak in HasSystemFeatureCache." into rvc-dev

core/java/android/app/ApplicationPackageManager.java

diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index 969ea70..87d33a9 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -99,6 +99,7 @@
 import android.view.Display;
 
 import com.android.internal.annotations.GuardedBy;
+import com.android.internal.annotations.Immutable;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.os.SomeArgs;
 import com.android.internal.util.UserIcons;
@@ -612,7 +613,11 @@
         return hasSystemFeature(name, 0);
     }
 
-    private class HasSystemFeatureQuery {
+    /**
+     * Identifies a single hasSystemFeature query.
+     */
+    @Immutable
+    private static final class HasSystemFeatureQuery {
         public final String name;
         public final int version;
         public HasSystemFeatureQuery(String n, int v) {