summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorStephen Smalley <sds@tycho.nsa.gov>2013-04-05 11:27:19 -0400
committerStephen Smalley <sds@tycho.nsa.gov>2013-04-05 13:37:27 -0400
commit2c90ac6849120bafbab0bf98ced770b0f5956a84 (patch)
tree6ef3a30c5a50029f8d09e0452b05f1a337abd4f5 /services
parent9658de2df79f6472dd0728d50074e27a3553637d (diff)
downloadframeworks_base-2c90ac6849120bafbab0bf98ced770b0f5956a84.zip
frameworks_base-2c90ac6849120bafbab0bf98ced770b0f5956a84.tar.gz
frameworks_base-2c90ac6849120bafbab0bf98ced770b0f5956a84.tar.bz2
Add /data/security path for mac_permissions.xml.
/data/security is now the preferred location for updated policy files. Add it for mac_permissions.xml. Separate change will remove the old /data/system location. Change-Id: I2774661e84c858c9b698ec60e224bbbcdac732f3 Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Diffstat (limited to 'services')
-rw-r--r--services/java/com/android/server/pm/SELinuxMMAC.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/java/com/android/server/pm/SELinuxMMAC.java b/services/java/com/android/server/pm/SELinuxMMAC.java
index 4bbdb5e..3e507bd 100644
--- a/services/java/com/android/server/pm/SELinuxMMAC.java
+++ b/services/java/com/android/server/pm/SELinuxMMAC.java
@@ -57,6 +57,7 @@ public final class SELinuxMMAC {
// Locations of potential install policy files.
private static final File[] INSTALL_POLICY_FILE = {
+ new File(Environment.getDataDirectory(), "security/mac_permissions.xml"),
new File(Environment.getDataDirectory(), "system/mac_permissions.xml"),
new File(Environment.getRootDirectory(), "etc/security/mac_permissions.xml"),
null};