From ac67508fcfcaf7ff074c41ea11085140fc4c2974 Mon Sep 17 00:00:00 2001 From: Dario Freni Date: Thu, 11 Nov 2021 20:38:44 +0000 Subject: [PATCH] Revert "Revert "Detect system_ext provenance for APKs-in-APEX"" This reverts commit 0f467cc8ff17dab85c29783d67abd99481d1aa24. Reason for revert: Including a fix for non-APEX-enabled devices. Change-Id: I238e88684f48981c44e7152f97b4ca16bed6d166 --- .../com/android/server/pm/InitAndSystemPackageHelper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java index 5ff0a6f7a59e1..a8da7462bb669 100644 --- a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java +++ b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java @@ -151,8 +151,10 @@ final class InitAndSystemPackageHelper { 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())) { + 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); } }