Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add testing api to SELinuxMMAC code."

Browse Source
This commit is contained in:
Nick Kralevich
2014-09-02 16:52:13 +00:00
committed by Gerrit Code Review
parent 25d928f687 99891156fc
commit 0988daaa23
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
services/java/com/android/server/pm/SELinuxMMAC.java
View File

@@ -137,6 +137,14 @@ public final class SELinuxMMAC {
} }
public static boolean readInstallPolicy() { public static boolean readInstallPolicy() {
return readInstallPolicy(MAC_PERMISSIONS);
}
public static boolean readInstallPolicy(String macPermsPath) {
if (macPermsPath == null) {
throw new NullPointerException("mac_permissions.xml file path is null");
}
// Temp structures to hold the rules while we parse the xml file. // Temp structures to hold the rules while we parse the xml file.
// We add all the rules together once we know there's no structural problems. // We add all the rules together once we know there's no structural problems.
HashMap<Signature, Policy> sigSeinfo = new HashMap<Signature, Policy>(); HashMap<Signature, Policy> sigSeinfo = new HashMap<Signature, Policy>();
@@ -144,8 +152,8 @@ public final class SELinuxMMAC {
FileReader policyFile = null; FileReader policyFile = null;
try { try {
policyFile = new FileReader(MAC_PERMISSIONS); policyFile = new FileReader(macPermsPath);
Slog.d(TAG, "Using policy file " + MAC_PERMISSIONS); Slog.d(TAG, "Using policy file " + macPermsPath);
XmlPullParser parser = Xml.newPullParser(); XmlPullParser parser = Xml.newPullParser();
parser.setInput(policyFile); parser.setInput(policyFile);
@@ -190,10 +198,10 @@ public final class SELinuxMMAC {
} }
} }
} catch (XmlPullParserException xpe) { } catch (XmlPullParserException xpe) {
Slog.w(TAG, "Got exception parsing " + MAC_PERMISSIONS, xpe); Slog.w(TAG, "Got exception parsing " + macPermsPath, xpe);
return false; return false;
} catch (IOException ioe) { } catch (IOException ioe) {
Slog.w(TAG, "Got exception parsing " + MAC_PERMISSIONS, ioe); Slog.w(TAG, "Got exception parsing " + macPermsPath, ioe);
return false; return false;
} finally { } finally {
IoUtils.closeQuietly(policyFile); IoUtils.closeQuietly(policyFile);