From 4f5d60403da8c63cf9d11a6d65bdcd18e10bdc4c Mon Sep 17 00:00:00 2001 From: Kevin DuBois Date: Mon, 29 Mar 2021 12:43:16 -0700 Subject: [PATCH] sepolicy: allow hwservice to see armnn nnhal. Allows hwservice to see armnn nnhal. Fixes: 183917925 Test: build, check for absence of error msg in logcat. Test: run_nnapi_tests for darwinn Test: CtsNNAPITestCases64 --hal_service_instance=android.hardware.neuralnetworks@1.3::IDevice/google-edgetpu --gtest_filter="TestGenerated*" Change-Id: I9778e92d6f15e9aa74774c6a8d143969951046eb --- whitechapel/vendor/google/hal_neuralnetworks_armnn.te | 2 ++ whitechapel/vendor/google/hal_neuralnetworks_darwinn.te | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/whitechapel/vendor/google/hal_neuralnetworks_armnn.te b/whitechapel/vendor/google/hal_neuralnetworks_armnn.te index 64ffc23e..c9872853 100644 --- a/whitechapel/vendor/google/hal_neuralnetworks_armnn.te +++ b/whitechapel/vendor/google/hal_neuralnetworks_armnn.te @@ -1,4 +1,6 @@ type hal_neuralnetworks_armnn, domain; +hal_server_domain(hal_neuralnetworks_armnn, hal_neuralnetworks) + type hal_neuralnetworks_armnn_exec, vendor_file_type, exec_type, file_type; allow hal_neuralnetworks_armnn gpu_device:chr_file rw_file_perms; diff --git a/whitechapel/vendor/google/hal_neuralnetworks_darwinn.te b/whitechapel/vendor/google/hal_neuralnetworks_darwinn.te index 9329a878..25ba9f28 100644 --- a/whitechapel/vendor/google/hal_neuralnetworks_darwinn.te +++ b/whitechapel/vendor/google/hal_neuralnetworks_darwinn.te @@ -14,7 +14,7 @@ allow hal_neuralnetworks_darwinn vendor_configs_file:file r_file_perms; allow hal_neuralnetworks_darwinn hal_neuralnetworks_darwinn_data_file:file create_file_perms; allow hal_neuralnetworks_darwinn hal_neuralnetworks_darwinn_data_file:dir rw_dir_perms; -# Register to hwbinder service -add_hwservice(hal_neuralnetworks_darwinn, hal_neuralnetworks_hwservice) +# Register to hwbinder service. +# add_hwservice() is granted by hal_server_domain + hal_neuralnetworks.te hwbinder_use(hal_neuralnetworks_darwinn) get_prop(hal_neuralnetworks_darwinn, hwservicemanager_prop)