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

Merge "Refine getPackageInfo for Apex match policy"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-24 13:06:33 +00:00
committed by Android (Google) Code Review
parent 7e9642ed02 4a352431a8
commit d5e956fa50
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/pm/ApexManager.java
View File

@@ -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;
}
}

2
services/core/java/com/android/server/pm/PackageManagerService.java
View File

@@ -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);
}
}