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 am: fb8dbf9157 am: ac889bc8fc

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

Change-Id: Iadbc325c2d6741dcf37e451e7ee855f8045e4237
This commit is contained in:
Treehugger Robot
2021-11-15 23:26:49 +00:00
committed by Automerger Merge Worker
parent 823a7e93f2 ac889bc8fc
commit 2adab0488c
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

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