From 0f467cc8ff17dab85c29783d67abd99481d1aa24 Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Thu, 11 Nov 2021 15:53:13 +0000 Subject: [PATCH] Revert "Detect system_ext provenance for APKs-in-APEX" This reverts commit abf29541e5d132e7c8e45ac16343bffbfc558be8. Reason for revert: This breaks wembley boot, as TreeHugger repeatedly pointed out on this CL, and which was ignored. Bug: 205967276 Change-Id: Ic5ecc257ec79a759d124da459e0fb584f62c471b --- .../java/com/android/server/pm/InitAndSystemPackageHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java index ffa3e50fb88b4..5ff0a6f7a59e1 100644 --- a/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java +++ b/services/core/java/com/android/server/pm/InitAndSystemPackageHelper.java @@ -152,7 +152,7 @@ final class InitAndSystemPackageHelper { 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() + File.separator)) { + sp.getFolder().getAbsolutePath())) { return new ScanPartition(apexInfo.apexDirectory, sp, SCAN_AS_APK_IN_APEX); } }