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

Merge "Fix the scanning on non-APEX devices." am: 6589fd106d

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1889637

Change-Id: I96575cfdec30d5b9e7183d6559fc223c359b34d7
This commit is contained in:
Treehugger Robot
2021-11-15 22:57:09 +00:00
committed by Automerger Merge Worker
parent 79f3ff5ad6 6589fd106d
commit fb8dbf9157
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21917,8 +21917,10 @@ public class PackageManagerService extends IPackageManager.Stub
ApexManager.ActiveApexInfo apexInfo) { ApexManager.ActiveApexInfo apexInfo) {
for (int i = 0, size = SYSTEM_PARTITIONS.size(); i < size; i++) { for (int i = 0, size = SYSTEM_PARTITIONS.size(); i < size; i++) {
ScanPartition sp = SYSTEM_PARTITIONS.get(i); ScanPartition sp = SYSTEM_PARTITIONS.get(i);
if (apexInfo.preInstalledApexPath.getAbsolutePath().startsWith( if (apexInfo.preInstalledApexPath.getAbsolutePath().equals(
sp.getFolder().getAbsolutePath() + File.separator)) { sp.getFolder().getAbsolutePath())
|| apexInfo.preInstalledApexPath.getAbsolutePath().startsWith(
sp.getFolder().getAbsolutePath() + File.separator)) {
return new ScanPartition(apexInfo.apexDirectory, sp, SCAN_AS_APK_IN_APEX); return new ScanPartition(apexInfo.apexDirectory, sp, SCAN_AS_APK_IN_APEX);
} }
} }