Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54fdfae7 authored by Gavin Corkery's avatar Gavin Corkery Committed by Automerger Merge Worker
Browse files

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12684684

Change-Id: I5efd0e350a015c0dffe0170dff16195b5a753a5a
parents 6a78ef52 a4d6ee2b

services/core/java/com/android/server/RescueParty.java

+5 −1
Original line number Original line Diff line number Diff line
@@ -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) {