From 56b9656372b51eee6f1849cd2f1428ace78729bc Mon Sep 17 00:00:00 2001 From: Todd Kennedy Date: Tue, 21 Jun 2016 22:14:55 +0000 Subject: [PATCH] Revert "Parse "vendor/priv-app" to find privileged applications" This reverts commit 02708b1ac41e12029b806085f8ff76a0e2c916b5. Change-Id: Ie1ba362a9f5ee46516a79c35bd4a6e45f84b6a32 --- .../android/server/pm/PackageManagerService.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 2986a129dd556..ada0a6be98df7 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -2446,14 +2446,8 @@ public class PackageManagerService extends IPackageManager.Stub { | PackageParser.PARSE_IS_SYSTEM | PackageParser.PARSE_IS_SYSTEM_DIR, scanFlags, 0); - // Collected privileged vendor packages. - final File privilegedVendorAppDir = new File(Environment.getVendorDirectory(), "priv-app"); - scanDirLI(privilegedVendorAppDir, PackageParser.PARSE_IS_SYSTEM - | PackageParser.PARSE_IS_SYSTEM_DIR - | PackageParser.PARSE_IS_PRIVILEGED, scanFlags, 0); - // Collect all vendor packages. - File vendorAppDir = new File(Environment.getVendorDirectory(), "app"); + File vendorAppDir = new File("/vendor/app"); try { vendorAppDir = vendorAppDir.getCanonicalFile(); } catch (IOException e) { @@ -15820,10 +15814,7 @@ public class PackageManagerService extends IPackageManager.Stub { try { final String privilegedAppDir = new File(Environment.getRootDirectory(), "priv-app") .getCanonicalPath(); - final String privilegedAppVendorDir = new File(Environment.getVendorDirectory(), "priv-app") - .getCanonicalPath(); - return (path.getCanonicalPath().startsWith(privilegedAppDir) - || path.getCanonicalPath().startsWith(privilegedAppVendorDir)); + return path.getCanonicalPath().startsWith(privilegedAppDir); } catch (IOException e) { Slog.e(TAG, "Unable to access code path " + path); }