commit b5e98161ddc8f5e5e88719dc4004204832facc31
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 11 19:47:30 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 11 19:47:30 2018 +0000
tree 5f9a2045c8476cea4463cebc27b6731f58923154
parent 8a3d990e859e0ad072abe8c5aba05b570bfb9985
parent 00e8d59af09e5407747ef22eb2c26d144bd01df9

Merge "Honors MATCH_ALL flag"

core/java/android/content/pm/PackageUserState.java

diff --git a/core/java/android/content/pm/PackageUserState.java b/core/java/android/content/pm/PackageUserState.java
index f471a1d..de173c4 100644
--- a/core/java/android/content/pm/PackageUserState.java
+++ b/core/java/android/content/pm/PackageUserState.java
@@ -21,6 +21,7 @@
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
 import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+import static android.content.pm.PackageManager.MATCH_ALL;
 import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
 import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
 import static android.content.pm.PackageManager.MATCH_DISABLED_COMPONENTS;
@@ -125,6 +126,9 @@
      * </p>
      */
     public boolean isMatch(ComponentInfo componentInfo, int flags) {
+        if ((flags & MATCH_ALL) != 0) {
+            return true;
+        }
         final boolean isSystemApp = componentInfo.applicationInfo.isSystemApp();
         final boolean matchUninstalled = (flags & PackageManager.MATCH_KNOWN_PACKAGES) != 0;
         if (!isAvailable(flags)