commit f53c57287d049400f706ec632f64f48bb6ab7137
author Tri Vo <trong@google.com> Thu Oct 03 22:29:53 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 03 22:29:53 2019 +0000
tree f8d004c26b75660d6f819d7497b6f127b88ca84b
parent 3f1999778cbe86df95cc08790df334509f1e0cb1
parent 3e70db526ef05bbf5d9f42072717a91e9866763c

Merge "sepolicy: fix missing label on vendor_service_contexts"

private/file_contexts

diff --git a/private/file_contexts b/private/file_contexts
index 3ecc347..6393f72 100644
--- a/private/file_contexts
+++ b/private/file_contexts
@@ -365,6 +365,8 @@
 # HAL location
 /(vendor|system/vendor)/lib(64)?/hw            u:object_r:vendor_hal_file:s0
 
+/(vendor|system/vendor)/etc/selinux/(vendor|nonplat)_service_contexts u:object_r:nonplat_service_contexts_file:s0
+
 #############################
 # OEM and ODM files
 #

public/file.te

diff --git a/public/file.te b/public/file.te
index 45c2fbc..8a8a0bc 100644
--- a/public/file.te
+++ b/public/file.te
@@ -477,7 +477,7 @@
 type service_contexts_file, system_file_type, file_type;
 
 # nonplat service_contexts file (only accessible on non full-treble devices)
-type nonplat_service_contexts_file, file_type;
+type nonplat_service_contexts_file, vendor_file_type, file_type;
 
 # hwservice_contexts file
 type hwservice_contexts_file, system_file_type, file_type;