commit c211539769dfaa507cfaf7dc22e9feb56065018c
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Jun 22 01:13:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 22 01:13:56 2016 +0000
tree 97377c336cb4e37f5bec947154c1a9751476a7b9
parent 34ed8ad3c2c27fb0251a016ced42fda10aa51caa
parent 56b9656372b51eee6f1849cd2f1428ace78729bc

Merge "Revert "Parse "vendor/priv-app" to find privileged applications"" into nyc-dev

services/core/java/com/android/server/pm/PackageManagerService.java

diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 12917b4..2a85694 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -2448,14 +2448,8 @@
                     | 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) {
@@ -15819,10 +15813,7 @@
         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);
         }