Merge "Add /apex to the list of allowed SystemServer paths" into rvc-dev am: 55815db140 am: 751c69b1c1 am: 238bce9862

Change-Id: I621067b88d7d08bfb7a5523d119c2626cbb0f0ac

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

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