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

Android.mk

@@ -701,6 +701,7 @@ $(LOCAL_BUILT_MODULE): PRIVATE_MLS_CATS := $(MLS_CATS)
 $(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

@@ -148,7 +148,7 @@ compatible_property_only(`
     domain
     -coredomain
     -appdomain
-    -hal_nfc
+    -hal_nfc_server
     -vendor_init
   } {
     nfc_prop
@@ -189,6 +189,16 @@ compatible_property_only(`
     -radio_prop
   }:file no_rw_file_perms;
 
+  neverallow {
+    domain
+    -coredomain
+    -appdomain
+    -hal_nfc_server
+    -vendor_init
+  } {
+    nfc_prop
+  }:file no_rw_file_perms;
+
   neverallow {
     domain
     -coredomain