am 857fe511: am 0b4f63c3: am dd6b7495: am 83725810: Merge "Get rid of noise during boot." (244d18bf) · Commits · e / os / android_frameworks_base

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

+3 −5

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

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

		/**
		* 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.
		*/
		public static boolean readInstallPolicy(File policyFile) {
		@@ -356,8 +355,7 @@ public final class SELinuxMMAC {
		/**
		* Labels a package based on an seinfo tag from install policy.
		* The label is attached to the ApplicationInfo instance of the package.
		* @param PackageParser.Package object representing the package
		* to labeled.
		* @param pkg object representing the package to be labeled.
		* @return boolean which determines whether a non null seinfo label
		* was assigned to the package. A null value simply meaning that
		* no policy matched.
		@@ -425,7 +423,7 @@ public final class SELinuxMMAC {
		try {
		storedHash = IoUtils.readFileAsByteArray(SEAPP_HASH_FILE);
		} 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));