Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5094996c authored by Jeremie GARCIA's avatar Jeremie GARCIA Committed by android-build-merger
Browse files

Merge "Parse "vendor/priv-app" to find privileged applications" 

am: 8560d210

* commit '8560d210':
  Parse "vendor/priv-app" to find privileged applications
parents 41c51314 8560d210

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

+11 −2
Original line number Diff line number Diff line
@@ -2231,8 +2231,14 @@ public class PackageManagerService extends IPackageManager.Stub { 
            scanDirTracedLI(systemAppDir, 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("/vendor/app");













            File vendorAppDir = new File(Environment.getVendorDirectory(), "app");















            try {















                vendorAppDir = vendorAppDir.getCanonicalFile();















            } catch (IOException e) {










@@ -14601,7 +14607,10 @@ public class PackageManagerService extends IPackageManager.Stub {













        try {















            final String privilegedAppDir = new File(Environment.getRootDirectory(), "priv-app")















                    .getCanonicalPath();













            return path.getCanonicalPath().startsWith(privilegedAppDir);













            final String privilegedAppVendorDir = new File(Environment.getVendorDirectory(), "priv-app")













                    .getCanonicalPath();













            return (path.getCanonicalPath().startsWith(privilegedAppDir)













                    || path.getCanonicalPath().startsWith(privilegedAppVendorDir));















        } catch (IOException e) {















            Slog.e(TAG, "Unable to access code path " + path);















        }