diff options
author | Nick Kralevich <nnk@google.com> | 2014-09-02 16:52:13 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-02 16:52:13 +0000 |
commit | 0988daaa23b469b3021ad93f819736160e21391f (patch) | |
tree | f9e56d13ad94c8fbffd220ee7244bbbb1c640737 | |
parent | 25d928f687408058f007051878574ea66691d9dc (diff) | |
parent | 99891156fc33bda869bb0df1d20e50e01411bab0 (diff) | |
download | base-0988daaa23b469b3021ad93f819736160e21391f.tar.gz |
Merge "Add testing api to SELinuxMMAC code."
-rw-r--r-- | services/java/com/android/server/pm/SELinuxMMAC.java | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/services/java/com/android/server/pm/SELinuxMMAC.java b/services/java/com/android/server/pm/SELinuxMMAC.java index 81302b9e2169..98f299721c5d 100644 --- a/services/java/com/android/server/pm/SELinuxMMAC.java +++ b/services/java/com/android/server/pm/SELinuxMMAC.java @@ -137,6 +137,14 @@ public final class SELinuxMMAC { } 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. // We add all the rules together once we know there's no structural problems. HashMap<Signature, Policy> sigSeinfo = new HashMap<Signature, Policy>(); @@ -144,8 +152,8 @@ public final class SELinuxMMAC { FileReader policyFile = null; try { - policyFile = new FileReader(MAC_PERMISSIONS); - Slog.d(TAG, "Using policy file " + MAC_PERMISSIONS); + policyFile = new FileReader(macPermsPath); + Slog.d(TAG, "Using policy file " + macPermsPath); XmlPullParser parser = Xml.newPullParser(); parser.setInput(policyFile); @@ -190,10 +198,10 @@ public final class SELinuxMMAC { } } } catch (XmlPullParserException xpe) { - Slog.w(TAG, "Got exception parsing " + MAC_PERMISSIONS, xpe); + Slog.w(TAG, "Got exception parsing " + macPermsPath, xpe); return false; } catch (IOException ioe) { - Slog.w(TAG, "Got exception parsing " + MAC_PERMISSIONS, ioe); + Slog.w(TAG, "Got exception parsing " + macPermsPath, ioe); return false; } finally { IoUtils.closeQuietly(policyFile); |