[automerger skipped] Merge Coral/Flame into AOSP master am: 629ea98243 -s ours am: 77f824bdef -s ours
am: dbae2f7b4b -s ours
am skip reason: change_id I8e09417ee05af6047a28f0cf837b63a5b5e99194 with SHA1 cbae870f8d is in history
Change-Id: I12720f87ae284927ed47787097c5dfc42c04254d
diff --git a/vendor/google/citadeld.te b/vendor/google/citadeld.te
index 8b47d11..9db1a5e 100644
--- a/vendor/google/citadeld.te
+++ b/vendor/google/citadeld.te
@@ -12,3 +12,9 @@
allow citadeld hal_power_stats_default:binder { call transfer };
allow citadeld power_stats_service:service_manager find;
+
+# Let citadeld find and use statsd.
+hwbinder_use(citadeld)
+get_prop(citadeld, hwservicemanager_prop)
+allow citadeld fwk_stats_hwservice:hwservice_manager find;
+binder_call(citadeld, stats_service_server)
diff --git a/vendor/qcom/sdm710/file_contexts b/vendor/qcom/sdm710/file_contexts
index 57ffa8c..7b2e0bf 100644
--- a/vendor/qcom/sdm710/file_contexts
+++ b/vendor/qcom/sdm710/file_contexts
@@ -56,4 +56,4 @@
/vendor/lib(64)?/hw/vulkan\.sdm710\.so u:object_r:same_process_hal_file:s0
#Android NN Driver
-/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.1-service-qti u:object_r:hal_neuralnetworks_default_exec:s0
+/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.2-service-qti u:object_r:hal_neuralnetworks_default_exec:s0
