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

Commit 5bb1b8f3 authored by Calin Juravle's avatar Calin Juravle
Browse files

Add /apex to the list of allowed SystemServer paths 

SystemPartitions does not have the /apex mount. We need to do an
explicit check for it when recording the system server jars.

Test: DexManagerTests, manual
Bug: 148774920
Change-Id: I9c92866304d98144cb82f39b3c768948dcf284ea
parent e6897b19

services/core/java/com/android/server/pm/dex/DexManager.java

+4 −0
Original line number Diff line number Diff line
@@ -232,6 +232,10 @@ public class DexManager { 
    private boolean isSystemServerDexPathSupportedForOdex(String dexPath) {

        ArrayList<PackagePartitions.SystemPartition> partitions =

                PackagePartitions.getOrderedPartitions(identity());

        // First check the apex partition as it's not part of the SystemPartitions.

        if (dexPath.startsWith("/apex/")) {

            return true;

        }

        for (int i = 0; i < partitions.size(); i++) {

            if (partitions.get(i).containsPath(dexPath)) {

                return true;