commit 7042d472a74576ff86c90b998b7ac36b60a305ca
author Steven Moreland <smoreland@google.com> Wed Dec 23 20:18:03 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 23 20:18:03 2020 +0000
tree 31131e6bf024738aa260fb2f5eb58f0c8aec6bc4
parent 9afb3747fe670445415d9d487bb0f54e8b8608b3
parent bc2624a041cc3c7c2ae249b58933ffbe2451a4e5

Merge "hal_power_stats: use hal_attribute_service"

private/compat/30.0/30.0.ignore.cil

diff --git a/private/compat/30.0/30.0.ignore.cil b/private/compat/30.0/30.0.ignore.cil
index 8ab2887..e85a00a 100644
--- a/private/compat/30.0/30.0.ignore.cil
+++ b/private/compat/30.0/30.0.ignore.cil
@@ -25,6 +25,7 @@
     hal_audiocontrol_service
     hal_face_service
     hal_fingerprint_service
+    hal_memtrack_service
     gnss_device
     hal_dumpstate_config_prop
     hal_gnss_service

private/service_contexts

diff --git a/private/service_contexts b/private/service_contexts
index b13f163..218559b 100644
--- a/private/service_contexts
+++ b/private/service_contexts
@@ -4,6 +4,7 @@
 android.hardware.gnss.IGnss/default                                  u:object_r:hal_gnss_service:s0
 android.hardware.identity.IIdentityCredentialStore/default           u:object_r:hal_identity_service:s0
 android.hardware.light.ILights/default                               u:object_r:hal_light_service:s0
+android.hardware.memtrack.IMemtrack/default                          u:object_r:hal_memtrack_service:s0
 android.hardware.power.IPower/default                                u:object_r:hal_power_service:s0
 android.hardware.power.stats.IPowerStats/default                      u:object_r:hal_power_stats_service:s0
 android.hardware.rebootescrow.IRebootEscrow/default                  u:object_r:hal_rebootescrow_service:s0

public/attributes

diff --git a/public/attributes b/public/attributes
index c881466..8ba17cd 100644
--- a/public/attributes
+++ b/public/attributes
@@ -384,3 +384,4 @@
 
 # All types used for DMA-BUF heaps
 attribute dmabuf_heap_device_type;
+expandattribute dmabuf_heap_device_type false;

public/hal_memtrack.te

diff --git a/public/hal_memtrack.te b/public/hal_memtrack.te
index ed93a29..30a4480 100644
--- a/public/hal_memtrack.te
+++ b/public/hal_memtrack.te
@@ -2,3 +2,6 @@
 binder_call(hal_memtrack_client, hal_memtrack_server)
 
 hal_attribute_hwservice(hal_memtrack, hal_memtrack_hwservice)
+
+hal_attribute_service(hal_memtrack, hal_memtrack_service)
+binder_call(hal_memtrack_server, servicemanager)

public/service.te

diff --git a/public/service.te b/public/service.te
index 1b5e84f..a1e2fef 100644
--- a/public/service.te
+++ b/public/service.te
@@ -230,6 +230,7 @@
 type hal_identity_service, vendor_service, protected_service, service_manager_type;
 type hal_keymint_service, vendor_service, protected_service, service_manager_type;
 type hal_light_service, vendor_service, protected_service, service_manager_type;
+type hal_memtrack_service, vendor_service, protected_service, service_manager_type;
 type hal_power_service, vendor_service, protected_service, service_manager_type;
 type hal_power_stats_service, vendor_service, protected_service, service_manager_type;
 type hal_rebootescrow_service, vendor_service, protected_service, service_manager_type;

vendor/file_contexts

diff --git a/vendor/file_contexts b/vendor/file_contexts
index 2e6e69c..dd351cf 100644
--- a/vendor/file_contexts
+++ b/vendor/file_contexts
@@ -54,6 +54,7 @@
 /(vendor|system/vendor)/bin/hw/android\.hardware\.lights-service\.example     u:object_r:hal_light_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.lowpan@1\.0-service         u:object_r:hal_lowpan_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.memtrack@1\.0-service       u:object_r:hal_memtrack_default_exec:s0
+/(vendor|system/vendor)/bin/hw/android\.hardware\.memtrack-service.example    u:object_r:hal_memtrack_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@1\.0-service            u:object_r:hal_nfc_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@1\.1-service            u:object_r:hal_nfc_default_exec:s0
 /(vendor|system/vendor)/bin/hw/android\.hardware\.nfc@1\.2-service            u:object_r:hal_nfc_default_exec:s0