Snap for 6607158 from 2532dd7198c12c041107c9928d474d9e0771edd2 to mainline-release
Change-Id: I7990cee4128c79ea6aa7f812b5affd75546c9263
diff --git a/vendor/google/file_contexts b/vendor/google/file_contexts
index e566c62..7818dfb 100644
--- a/vendor/google/file_contexts
+++ b/vendor/google/file_contexts
@@ -9,6 +9,7 @@
/vendor/bin/hw/android\.hardware\.weaver@1\.0-service\.citadel u:object_r:hal_weaver_citadel_exec:s0
/vendor/bin/hw/android\.hardware\.keymaster@4\.1-service\.citadel u:object_r:hal_keymaster_citadel_exec:s0
/vendor/bin/hw/android\.hardware\.rebootescrow-service\.citadel u:object_r:hal_rebootescrow_citadel_exec:s0
+/vendor/bin/hw/android\.hardware\.identity@1\.0-service\.citadel u:object_r:hal_identity_citadel_exec:s0
/vendor/bin/hw/citadeld u:object_r:citadeld_exec:s0
/vendor/bin/hw/init_citadel u:object_r:init_citadel_exec:s0
/vendor/bin/hw/wait_for_strongbox u:object_r:wait_for_strongbox_exec:s0
diff --git a/vendor/google/hal_identity_citadel.te b/vendor/google/hal_identity_citadel.te
new file mode 100644
index 0000000..e29310c
--- /dev/null
+++ b/vendor/google/hal_identity_citadel.te
@@ -0,0 +1,9 @@
+type hal_identity_citadel, domain;
+type hal_identity_citadel_exec, exec_type, vendor_file_type, file_type;
+
+vndbinder_use(hal_identity_citadel)
+binder_call(hal_identity_citadel, citadeld)
+allow hal_identity_citadel citadeld_service:service_manager find;
+
+hal_server_domain(hal_identity_citadel, hal_identity)
+init_daemon_domain(hal_identity_citadel)
diff --git a/vendor/google/property_contexts b/vendor/google/property_contexts
index d9af5c4..be45d93 100644
--- a/vendor/google/property_contexts
+++ b/vendor/google/property_contexts
@@ -9,7 +9,6 @@
# ramoops
vendor.ramoops. u:object_r:vendor_ramoops_prop:s0
-vendor.powerhal.rendering u:object_r:power_prop:s0
persist.vendor.radio.no_wait_for_card u:object_r:vendor_radio_prop:s0
persist.vendor.shutdown. u:object_r:vendor_shutdown_prop:s0
persist.vendor.radio.multisim_switch_support u:object_r:vendor_radio_prop:s0
diff --git a/vendor/qcom/common/vendor_init.te b/vendor/qcom/common/vendor_init.te
index 6ffbd7c..4590949 100644
--- a/vendor/qcom/common/vendor_init.te
+++ b/vendor/qcom/common/vendor_init.te
@@ -15,7 +15,7 @@
')
set_prop(vendor_init, vendor_camera_prop)
-set_prop(vendor_init, power_prop)
+set_prop(vendor_init, vendor_power_prop)
set_prop(vendor_init, public_vendor_default_prop)
set_prop(vendor_init, vendor_bluetooth_prop)
set_prop(vendor_init, vendor_modem_diag_prop)
