Merge "Fix Rescue Party observability criteria" into rvc-qpr-dev

This commit is contained in:
Gavin Corkery
2020-09-24 15:42:12 +00:00
committed by Android (Google) Code Review

View File

@@ -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) {