Merge \"Revert \"Parse \"vendor/priv-app\" to find privileged applications\"\" into...

am: c211539769

Change-Id: I305fd763e69bc6d4836193397cb63f632e26a6a9

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index c627ff0..ca00e0a 100644 (file)
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2453,14 +2453,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) {
@@ -15827,10 +15821,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);
         }