summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2013-05-21 13:09:38 -0400
committerRicardo Cerqueira <cyanogenmod@cerqueira.org>2013-07-18 21:03:13 +0100
commit18f5453ee1c0e63b6feea00f7d8595898cb8aa27 (patch)
treec0a82d8303a9af5088981babfc4f719127ccad77 /services
parent526e4815aed873c1796274f00b95f3f0bcbbffe2 (diff)
downloadframeworks_base-18f5453ee1c0e63b6feea00f7d8595898cb8aa27.zip
frameworks_base-18f5453ee1c0e63b6feea00f7d8595898cb8aa27.tar.gz
frameworks_base-18f5453ee1c0e63b6feea00f7d8595898cb8aa27.tar.bz2
Restore support for labeling non-system apps based on their certificate.
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov> Change-Id: I814411cbc8d16eaed99a1389f5487529e36e637b
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/pm/SELinuxMMAC.java12
1 files changed, 0 insertions, 12 deletions
diff --git a/services/java/com/android/server/pm/SELinuxMMAC.java b/services/java/com/android/server/pm/SELinuxMMAC.java
index 65f9052..b73d75a 100644
--- a/services/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/java/com/android/server/pm/SELinuxMMAC.java
@@ -483,17 +483,6 @@ public final class SELinuxMMAC {
* @return boolean Indicates whether the package passed policy.
*/
public static boolean passInstallPolicyChecks(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.
for (Signature s : pkg.mSignatures) {
if (s == null)
@@ -525,7 +514,6 @@ public final class SELinuxMMAC {
}
return passed;
}
- }
// Check for a default policy.
if (SIG_POLICY.containsKey(null)) {