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

Commit 2adab048 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix the scanning on non-APEX devices." am: 6589fd10 am: fb8dbf91 am: ac889bc8 

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

Change-Id: Iadbc325c2d6741dcf37e451e7ee855f8045e4237
parents 823a7e93 ac889bc8

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

+4 −2
Original line number Diff line number Diff line
@@ -22051,7 +22051,9 @@ 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(

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

            }