summaryrefslogtreecommitdiff
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-09 09:01:31 (GMT)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-03-09 09:01:31 (GMT)
commit5bbae8cf3d055e6103284481b3f3cb8712230293 (patch)
tree96af2e263f533694b1e0dfc3816169f6cdd56d9f
parent01a14db3e277347d6026c0bc2a5a07b4f34ca896 (diff)
parent3a6279e23c4412823d637d2578f5e68da3cf97f8 (diff)
downloadcommon-5bbae8cf3d055e6103284481b3f3cb8712230293.zip
common-5bbae8cf3d055e6103284481b3f3cb8712230293.tar.gz
common-5bbae8cf3d055e6103284481b3f3cb8712230293.tar.bz2
resolve merge conflicts of 07dca3d8f18109458d3c592233eff2b58232f4d4 to r-tv-dev am: 3a6279e23c
Change-Id: I7912aa46099f51d0998262ac39fc2d1f35fb8f22
Diffstat
-rw-r--r--sepolicy/vendor_init.te4
1 files changed, 4 insertions, 0 deletions
diff --git a/sepolicy/vendor_init.te b/sepolicy/vendor_init.te
index 08b0583..0101df9 100644
--- a/sepolicy/vendor_init.te
+++ b/sepolicy/vendor_init.te
@@ -19,6 +19,10 @@ allow vendor_init self:capability sys_module;
allow vendor_init proc:file write;
allow vendor_init unlabeled:dir search;
+allow vendor_init proc_vm_writable:file rw_file_perms;
+
+allow vendor_init ffs_prop:property_service set;
+
# optee
allow vendor_init drm_device:chr_file setattr;