commit cfbe2a1f552e1ec9a9d02e55180ffdbad0034768
author Treehugger Robot <treehugger-gerrit@google.com> Mon Feb 05 22:01:29 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Feb 05 22:01:29 2018 +0000
tree 42f76e01c914a6c9e413c3c6ad84779d60eff0af
parent cbe2d7d714a9218f03cf8ef328234a04cfc5675a
parent 64ade65d17bffd1f341653ecdcc7419edcf1215c

Merge "Add tests for compatible property (1/2)"

Android.mk

diff --git a/Android.mk b/Android.mk
index 759efe1..aa6e07c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -701,6 +701,7 @@
 $(LOCAL_BUILT_MODULE): PRIVATE_TGT_ARCH := $(my_target_arch)
 $(LOCAL_BUILT_MODULE): PRIVATE_WITH_ASAN := false
 $(LOCAL_BUILT_MODULE): PRIVATE_SEPOLICY_SPLIT := cts
+$(LOCAL_BUILT_MODULE): PRIVATE_COMPATIBLE_PROPERTY := cts
 $(LOCAL_BUILT_MODULE): $(call build_policy, $(sepolicy_build_files), \
 $(PLAT_PUBLIC_POLICY) $(PLAT_PRIVATE_POLICY))
 	$(transform-policy-to-conf)

public/property.te

diff --git a/public/property.te b/public/property.te
index 5c34264..e400332 100644
--- a/public/property.te
+++ b/public/property.te
@@ -148,7 +148,7 @@
     domain
     -coredomain
     -appdomain
-    -hal_nfc
+    -hal_nfc_server
     -vendor_init
   } {
     nfc_prop
@@ -193,6 +193,16 @@
     domain
     -coredomain
     -appdomain
+    -hal_nfc_server
+    -vendor_init
+  } {
+    nfc_prop
+  }:file no_rw_file_perms;
+
+  neverallow {
+    domain
+    -coredomain
+    -appdomain
     -rild
     -vendor_init
   } {