am dd6b7495: am 83725810: Merge "Get rid of noise during boot." (37c59103) · Commits · e / os / android_frameworks_base

services/java/com/android/server/pm/SELinuxMMAC.java

+3 −5

Original line number	Original line	Diff line number	Diff line
	@@ -115,7 +115,6 @@ public final class SELinuxMMAC {

	/**		/**
	* Parses an MMAC install policy from a predefined list of locations.		* Parses an MMAC install policy from a predefined list of locations.
	* @param none
	* @return boolean indicating whether an install policy was correctly parsed.		* @return boolean indicating whether an install policy was correctly parsed.
	*/		*/
	public static boolean readInstallPolicy() {		public static boolean readInstallPolicy() {
	@@ -125,7 +124,7 @@ public final class SELinuxMMAC {

	/**		/**
	* Parses an MMAC install policy given as an argument.		* Parses an MMAC install policy given as an argument.
	* @param File object representing the path of the policy.		* @param policyFile object representing the path of the policy.
	* @return boolean indicating whether the install policy was correctly parsed.		* @return boolean indicating whether the install policy was correctly parsed.
	*/		*/
	public static boolean readInstallPolicy(File policyFile) {		public static boolean readInstallPolicy(File policyFile) {
	@@ -357,8 +356,7 @@ public final class SELinuxMMAC {
	/**		/**
	* Labels a package based on an seinfo tag from install policy.		* Labels a package based on an seinfo tag from install policy.
	* The label is attached to the ApplicationInfo instance of the package.		* The label is attached to the ApplicationInfo instance of the package.
	* @param PackageParser.Package object representing the package		* @param pkg object representing the package to be labeled.
	* to labeled.
	* @return boolean which determines whether a non null seinfo label		* @return boolean which determines whether a non null seinfo label
	* was assigned to the package. A null value simply meaning that		* was assigned to the package. A null value simply meaning that
	* no policy matched.		* no policy matched.
	@@ -426,7 +424,7 @@ public final class SELinuxMMAC {
	try {		try {
	storedHash = IoUtils.readFileAsByteArray(SEAPP_HASH_FILE);		storedHash = IoUtils.readFileAsByteArray(SEAPP_HASH_FILE);
	} catch (IOException ioe) {		} catch (IOException ioe) {
	Slog.e(TAG, "Error opening " + SEAPP_HASH_FILE + ". Assuming first boot.", ioe);		Slog.w(TAG, "Error opening " + SEAPP_HASH_FILE + ". Assuming first boot.");
	}		}

	return (storedHash == null \|\| !MessageDigest.isEqual(storedHash, currentHash));		return (storedHash == null \|\| !MessageDigest.isEqual(storedHash, currentHash));