Merge "Create Power Stats AIDL interface"
diff --git a/citadel/citadeld.te b/citadel/citadeld.te
index a1b7a6d..266dee2 100644
--- a/citadel/citadeld.te
+++ b/citadel/citadeld.te
@@ -9,6 +9,7 @@
init_daemon_domain(citadeld)
binder_call(citadeld, hal_power_stats_default)
+allow citadeld hal_power_stats_vendor_service:service_manager find;
# Let citadeld find and use statsd.
hwbinder_use(citadeld)
diff --git a/citadel/vndservice.te b/citadel/vndservice.te
index 880c09c..a756bce 100644
--- a/citadel/vndservice.te
+++ b/citadel/vndservice.te
@@ -1 +1,2 @@
type citadeld_service, vndservice_manager_type;
+type hal_power_stats_vendor_service, vndservice_manager_type;
diff --git a/citadel/vndservice_contexts b/citadel/vndservice_contexts
index b4df996..2e1be43 100644
--- a/citadel/vndservice_contexts
+++ b/citadel/vndservice_contexts
@@ -1 +1,2 @@
android.hardware.citadel.ICitadeld u:object_r:citadeld_service:s0
+power.stats-vendor u:object_r:hal_power_stats_vendor_service:s0
diff --git a/common/file_contexts b/common/file_contexts
index e86fd9f..53c8dca 100644
--- a/common/file_contexts
+++ b/common/file_contexts
@@ -7,3 +7,5 @@
/vendor/bin/awk u:object_r:vendor_toolbox_exec:s0
/vendor/bin/cp u:object_r:vendor_toolbox_exec:s0
/vendor/bin/toolbox_vendor u:object_r:vendor_toolbox_exec:s0
+
+/(vendor|system/vendor)/bin/hw/android\.hardware\.powerstats-service\.pixel u:object_r:hal_power_stats_default_exec:s0
diff --git a/powerstats/hal_power_stats_default.te b/powerstats/hal_power_stats_default.te
new file mode 100644
index 0000000..7e00470
--- /dev/null
+++ b/powerstats/hal_power_stats_default.te
@@ -0,0 +1,5 @@
+add_service(hal_power_stats_default, hal_power_stats_vendor_service)
+
+vndbinder_use(hal_power_stats)
+add_service(hal_power_stats_server, hal_power_stats_service)
+