diff options
author | Nick Kralevich <nnk@google.com> | 2014-06-12 21:00:53 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-06-12 03:32:07 +0000 |
commit | 1ef888e564926b78aeb02ef1085be2f72227b862 (patch) | |
tree | af55ba015b81724423386c2a61fa5a591bb47d6a | |
parent | 1a3908e95926acd8add3858be571fe23fa9d047a (diff) | |
parent | 5f5cf5f67002420317dd3764822881b10f79eef8 (diff) | |
download | base-1ef888e564926b78aeb02ef1085be2f72227b862.tar.gz |
Merge "Add service_contexts to policy update bundles."
-rw-r--r-- | services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java b/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java index 55dd4ab3c629..24318df22962 100644 --- a/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java +++ b/services/java/com/android/server/updates/SELinuxPolicyInstallReceiver.java @@ -42,6 +42,7 @@ public class SELinuxPolicyInstallReceiver extends ConfigUpdateInstallReceiver { private static final String seappContextsPath = "seapp_contexts"; private static final String versionPath = "selinux_version"; private static final String macPermissionsPath = "mac_permissions.xml"; + private static final String serviceContextsPath = "service_contexts"; public SELinuxPolicyInstallReceiver() { super("/data/security/bundle", "sepolicy_bundle", "metadata/", "version"); @@ -65,6 +66,9 @@ public class SELinuxPolicyInstallReceiver extends ConfigUpdateInstallReceiver { new File(contexts, sepolicyPath).renameTo( new File(contexts, sepolicyPath + "_backup")); + + new File(contexts, serviceContextsPath).renameTo( + new File(contexts, serviceContextsPath + "_backup")); } private void copyUpdate(File contexts) { @@ -74,6 +78,7 @@ public class SELinuxPolicyInstallReceiver extends ConfigUpdateInstallReceiver { new File(updateDir, propertyContextsPath).renameTo(new File(contexts, propertyContextsPath)); new File(updateDir, fileContextsPath).renameTo(new File(contexts, fileContextsPath)); new File(updateDir, sepolicyPath).renameTo(new File(contexts, sepolicyPath)); + new File(updateDir, serviceContextsPath).renameTo(new File(contexts, serviceContextsPath)); } private int readInt(BufferedInputStream reader) throws IOException { @@ -85,13 +90,14 @@ public class SELinuxPolicyInstallReceiver extends ConfigUpdateInstallReceiver { } private int[] readChunkLengths(BufferedInputStream bundle) throws IOException { - int[] chunks = new int[6]; + int[] chunks = new int[7]; chunks[0] = readInt(bundle); chunks[1] = readInt(bundle); chunks[2] = readInt(bundle); chunks[3] = readInt(bundle); chunks[4] = readInt(bundle); chunks[5] = readInt(bundle); + chunks[6] = readInt(bundle); return chunks; } @@ -112,6 +118,7 @@ public class SELinuxPolicyInstallReceiver extends ConfigUpdateInstallReceiver { installFile(new File(updateDir, propertyContextsPath), stream, chunkLengths[3]); installFile(new File(updateDir, fileContextsPath), stream, chunkLengths[4]); installFile(new File(updateDir, sepolicyPath), stream, chunkLengths[5]); + installFile(new File(updateDir, serviceContextsPath), stream, chunkLengths[6]); } finally { IoUtils.closeQuietly(stream); } |