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

Commit d5e956fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Refine getPackageInfo for Apex match policy"

parents 7e9642ed 4a352431

services/core/java/com/android/server/pm/ApexManager.java

+2 −2
Original line number Diff line number Diff line
@@ -335,8 +335,8 @@ abstract class ApexManager { 
                if (!packageInfo.packageName.equals(packageName)) {

                    continue;

                }

                if ((!matchActive || isActive(packageInfo))

                        && (!matchFactory || isFactory(packageInfo))) {

                if ((matchActive && isActive(packageInfo))

                        || (matchFactory && isFactory(packageInfo))) {

                    return packageInfo;

                }

            }

services/core/java/com/android/server/pm/PackageManagerService.java

+1 −1
Original line number Diff line number Diff line
@@ -4092,7 +4092,7 @@ public class PackageManagerService extends IPackageManager.Stub 
                }

                return generatePackageInfo(ps, flags, userId);

            }

            if (!matchFactoryOnly && (flags & MATCH_APEX) != 0) {

            if ((flags & MATCH_APEX) != 0) {

                return mApexManager.getPackageInfo(packageName, ApexManager.MATCH_ACTIVE_PACKAGE);

            }

        }