From 0ddfebb4e19714e79941afa33643c422015d3c62 Mon Sep 17 00:00:00 2001 From: George Chang Date: Fri, 29 Oct 2021 15:51:15 +0800 Subject: [PATCH] Add hal_nfc_service Bug: 204868826 Test: atest VtsAidlHalNfcTargetTest Change-Id: If01d1d0a74f5c787805d3744772d40a7aa7db9cb --- private/compat/32.0/32.0.ignore.cil | 1 + private/service_contexts | 1 + public/dumpstate.te | 1 + public/hal_nfc.te | 2 ++ public/service.te | 1 + 5 files changed, 6 insertions(+) diff --git a/private/compat/32.0/32.0.ignore.cil b/private/compat/32.0/32.0.ignore.cil index 43f813685..0a6e09cde 100644 --- a/private/compat/32.0/32.0.ignore.cil +++ b/private/compat/32.0/32.0.ignore.cil @@ -25,6 +25,7 @@ hal_graphics_composer_service hal_health_service hal_ir_service + hal_nfc_service hal_nlinterceptor_service hal_radio_config_service hal_radio_data_service diff --git a/private/service_contexts b/private/service_contexts index 35b9dcc6f..dc1341fa4 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -14,6 +14,7 @@ android.hardware.ir.IConsumerIr/default u:object_r: 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.net.nlinterceptor.IInterceptor/default u:object_r:hal_nlinterceptor_service:s0 +android.hardware.nfc.INfc/default u:object_r:hal_nfc_service:s0 android.hardware.oemlock.IOemLock/default u:object_r:hal_oemlock_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 diff --git a/public/dumpstate.te b/public/dumpstate.te index 7268166d7..3f9a127ae 100644 --- a/public/dumpstate.te +++ b/public/dumpstate.te @@ -147,6 +147,7 @@ dump_hal(hal_wifi) dump_hal(hal_graphics_allocator) dump_hal(hal_light) dump_hal(hal_neuralnetworks) +dump_hal(hal_nfc) dump_hal(hal_thermal) dump_hal(hal_power) dump_hal(hal_power_stats) diff --git a/public/hal_nfc.te b/public/hal_nfc.te index 7cef4a17d..3d0202b77 100644 --- a/public/hal_nfc.te +++ b/public/hal_nfc.te @@ -1,8 +1,10 @@ # HwBinder IPC from client to server, and callbacks binder_call(hal_nfc_client, hal_nfc_server) binder_call(hal_nfc_server, hal_nfc_client) +binder_call(hal_nfc_server, servicemanager) hal_attribute_hwservice(hal_nfc, hal_nfc_hwservice) +hal_attribute_service(hal_nfc, hal_nfc_service) # Set NFC properties (used by bcm2079x HAL). set_prop(hal_nfc, nfc_prop) diff --git a/public/service.te b/public/service.te index 0e9488ce7..dcd4f35d2 100644 --- a/public/service.te +++ b/public/service.te @@ -279,6 +279,7 @@ type hal_keymint_service, vendor_service, protected_service, service_manager_typ type hal_light_service, vendor_service, protected_service, service_manager_type; type hal_memtrack_service, vendor_service, protected_service, service_manager_type; type hal_neuralnetworks_service, vendor_service, service_manager_type; +type hal_nfc_service, vendor_service, protected_service, service_manager_type; type hal_oemlock_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;