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

Commit 3f924d04 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Detect system_ext provenance for APKs-in-APEX" am: 66fadd90 am: 618d74c5 am: 43b384ef 

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

Change-Id: I8fcce72ac39eddac941ba149c3adf1e5af3685c8
parents 356abccc 43b384ef

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

+1 −1
Original line number Diff line number Diff line
@@ -22052,7 +22052,7 @@ public class PackageManagerService extends IPackageManager.Stub 
        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())) {

                    sp.getFolder().getAbsolutePath() + File.separator)) {

                return new ScanPartition(apexInfo.apexDirectory, sp, SCAN_AS_APK_IN_APEX);

            }

        }