Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Rescue Party observability criteria"

Browse Source
This commit is contained in:
Gavin Corkery
2020-10-21 10:55:23 +00:00
committed by Gerrit Code Review
parent 208cdcbf3f b6a3409500
commit 51704f4d07
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/RescueParty.java
View File

@@ -454,10 +454,14 @@ public class RescueParty {
public boolean mayObservePackage(String packageName) { public boolean mayObservePackage(String packageName) {
PackageManager pm = mContext.getPackageManager(); PackageManager pm = mContext.getPackageManager();
try { 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) { if (pm.getModuleInfo(packageName, 0) != null) {
return true; return true;
} }
} catch (PackageManager.NameNotFoundException ignore) {
}
try {
ApplicationInfo info = pm.getApplicationInfo(packageName, 0); ApplicationInfo info = pm.getApplicationInfo(packageName, 0);
return (info.flags & PERSISTENT_MASK) == PERSISTENT_MASK; return (info.flags & PERSISTENT_MASK) == PERSISTENT_MASK;
} catch (PackageManager.NameNotFoundException e) { } catch (PackageManager.NameNotFoundException e) {