Merge \"Parse \"vendor/priv-app\" to find privileged applications\" into nyc-dev (bc7e15ee) · Commits · e / os / android_frameworks_base

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

+11 −2

Original line number	Diff line number	Diff line
		@@ -2453,8 +2453,14 @@ 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("/vendor/app");
		File vendorAppDir = new File(Environment.getVendorDirectory(), "app");
		try {
		vendorAppDir = vendorAppDir.getCanonicalFile();
		} catch (IOException e) {
		@@ -15820,7 +15826,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);
		}