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

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

+2 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2453,14 +2453,8 @@ public class PackageManagerService extends IPackageManager.Stub {
	\| PackageParser.PARSE_IS_SYSTEM		\| PackageParser.PARSE_IS_SYSTEM
	\| PackageParser.PARSE_IS_SYSTEM_DIR, scanFlags, 0);		\| 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.		// Collect all vendor packages.
	File vendorAppDir = new File(Environment.getVendorDirectory(), "app");		File vendorAppDir = new File("/vendor/app");
	try {		try {
	vendorAppDir = vendorAppDir.getCanonicalFile();		vendorAppDir = vendorAppDir.getCanonicalFile();
	} catch (IOException e) {		} catch (IOException e) {
	@@ -15827,10 +15821,7 @@ public class PackageManagerService extends IPackageManager.Stub {
	try {		try {
	final String privilegedAppDir = new File(Environment.getRootDirectory(), "priv-app")		final String privilegedAppDir = new File(Environment.getRootDirectory(), "priv-app")
	.getCanonicalPath();		.getCanonicalPath();
	final String privilegedAppVendorDir = new File(Environment.getVendorDirectory(), "priv-app")		return path.getCanonicalPath().startsWith(privilegedAppDir);
	.getCanonicalPath();
	return (path.getCanonicalPath().startsWith(privilegedAppDir)
	\|\| path.getCanonicalPath().startsWith(privilegedAppVendorDir));
	} catch (IOException e) {		} catch (IOException e) {
	Slog.e(TAG, "Unable to access code path " + path);		Slog.e(TAG, "Unable to access code path " + path);
	}		}