Merge "Revert "Add a policy version."" into jb-mr2-dev
diff --git a/adbd.te b/adbd.te
index c565bd7..8420298 100644
--- a/adbd.te
+++ b/adbd.te
@@ -3,7 +3,7 @@
 type adbd, domain, mlstrustedsubject;
 allow adbd adb_device:chr_file rw_file_perms;
 allow adbd qemu_device:chr_file rw_file_perms;
-allow adbd self:capability { net_raw setgid setuid dac_override sys_boot sys_admin };
+allow adbd self:capability { net_raw setgid setuid setpcap dac_override sys_boot sys_admin };
 allow adbd rootfs:file { r_file_perms entrypoint };
 allow adbd init:process sigchld;
 allow adbd self:tcp_socket *;
diff --git a/vold.te b/vold.te
index 26532c1..8dd2137 100644
--- a/vold.te
+++ b/vold.te
@@ -7,6 +7,7 @@
 allow vold system_file:file x_file_perms;
 allow vold block_device:dir create_dir_perms;
 allow vold block_device:blk_file create_file_perms;
+allow vold device:dir write;
 allow vold devpts:chr_file rw_file_perms;
 allow vold rootfs:dir mounton;
 allow vold sdcard_type:dir mounton;
@@ -56,7 +57,7 @@
 allow vold proc:file write;
 
 # Create and mount on /data/tmp_mnt.
-allow vold system_data_file:dir { rw_dir_perms mounton };
+allow vold system_data_file:dir { create rw_dir_perms mounton };
 
 # Set scheduling policy of kernel processes
 allow vold kernel:process setsched;