am d172419e: am 9b1a7d45: Merge "Allow different SELinux policies for third party apps."

* commit 'd172419e9a36f61af8c98d316ec2625e1f1304f6':
  Allow different SELinux policies for third party apps.
This commit is contained in:
Nick Kralevich
2014-07-01 21:16:14 +00:00
committed by Android Git Automerger

View File

@ -346,15 +346,6 @@ public final class SELinuxMMAC {
*/ */
public static boolean assignSeinfoValue(PackageParser.Package pkg) { public static boolean assignSeinfoValue(PackageParser.Package pkg) {
/*
* Non system installed apps should be treated the same. This
* means that any post-loaded apk will be assigned the default
* tag, if one exists in the policy, else null, without respect
* to the signing key.
*/
if (((pkg.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0) ||
((pkg.applicationInfo.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0)) {
// We just want one of the signatures to match. // We just want one of the signatures to match.
for (Signature s : pkg.mSignatures) { for (Signature s : pkg.mSignatures) {
if (s == null) if (s == null)
@ -373,7 +364,6 @@ public final class SELinuxMMAC {
} }
} }
} }
}
// If we have a default seinfo value then great, otherwise // If we have a default seinfo value then great, otherwise
// we set a null object and that is what we started with. // we set a null object and that is what we started with.