Merge "Fix Rescue Party observability criteria"

2020-10-21 10:55:23 +00:00
parent 208cdcbf3f b6a3409500
commit 51704f4d07
1 changed files with 5 additions and 1 deletions
--- a/services/core/java/com/android/server/RescueParty.java
+++ b/services/core/java/com/android/server/RescueParty.java
@@ -454,10 +454,14 @@ public class RescueParty {
        public boolean mayObservePackage(String packageName) {
            PackageManager pm = mContext.getPackageManager();
            try {
-                // A package is a Mainline module if this is non-null
+                // A package is a module if this is non-null
                if (pm.getModuleInfo(packageName, 0) != null) {
                    return true;
                }
+            } catch (PackageManager.NameNotFoundException ignore) {
+            }
+
+            try {
                ApplicationInfo info = pm.getApplicationInfo(packageName, 0);
                return (info.flags & PERSISTENT_MASK) == PERSISTENT_MASK;
            } catch (PackageManager.NameNotFoundException e) {