Merge "PackageManager: remove GET_CERTIFICATES boolean" (97efc15b) · Commits · e / os / android_frameworks_base

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

+19 −23

Original line number	Diff line number	Diff line
		@@ -199,8 +199,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		private static final int BLUETOOTH_UID = Process.BLUETOOTH_UID;
		private static final int SHELL_UID = Process.SHELL_UID;

		private static final boolean GET_CERTIFICATES = true;

		// Cap the size of permission trees that 3rd party apps can define
		private static final int MAX_PERMISSION_TREE_FOOTPRINT = 32768; // characters of text

		@@ -3783,7 +3781,6 @@ public class PackageManagerService extends IPackageManager.Stub {

		private boolean collectCertificatesLI(PackageParser pp, PackageSetting ps,
		PackageParser.Package pkg, File srcFile, int parseFlags) {
		if (GET_CERTIFICATES) {
		if (ps != null
		&& ps.codePath.equals(srcFile)
		&& ps.timeStamp == srcFile.lastModified()) {
		@@ -3804,7 +3801,6 @@ public class PackageManagerService extends IPackageManager.Stub {
		mLastScanError = pp.getParseError();
		return false;
		}
		}
		return true;
		}

		@@ -9452,7 +9448,7 @@ public class PackageManagerService extends IPackageManager.Stub {
		return;
		}
		}
		if (GET_CERTIFICATES && !pp.collectCertificates(pkg, parseFlags)) {
		if (!pp.collectCertificates(pkg, parseFlags)) {
		res.returnCode = pp.getParseError();
		return;
		}