From 95ee9ea7195eba3fceb5d6f12e912befa036aa57 Mon Sep 17 00:00:00 2001 From: Ahmad Khalil Date: Thu, 9 Nov 2023 17:17:40 +0000 Subject: [PATCH] Add fwk_vibrator_control_service Convert vibrator_control to a framework service (fwk_vibrator_control_service) in system_server. Bug: 305961689 Test: N/A Change-Id: I5f3aba2c58a3166593a11034a8d21dfd12311c2e --- build/soong/service_fuzzer_bindings.go | 2 +- private/compat/34.0/34.0.ignore.cil | 2 +- private/service_contexts | 2 +- public/hal_vibrator.te | 2 +- public/service.te | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/soong/service_fuzzer_bindings.go b/build/soong/service_fuzzer_bindings.go index a3a1393a9..0a2f97dac 100644 --- a/build/soong/service_fuzzer_bindings.go +++ b/build/soong/service_fuzzer_bindings.go @@ -145,6 +145,7 @@ var ( "android.frameworks.location.altitude.IAltitudeService/default": EXCEPTION_NO_FUZZER, "android.frameworks.sensorservice.ISensorManager/default": []string{"libsensorserviceaidl_fuzzer"}, "android.frameworks.stats.IStats/default": EXCEPTION_NO_FUZZER, + "android.frameworks.vibrator.IVibratorControlService/default": EXCEPTION_NO_FUZZER, "android.se.omapi.ISecureElementService/default": EXCEPTION_NO_FUZZER, "android.system.keystore2.IKeystoreService/default": EXCEPTION_NO_FUZZER, "android.system.net.netd.INetd/default": []string{"netd_hw_service_fuzzer"}, @@ -462,7 +463,6 @@ var ( "uwb": EXCEPTION_NO_FUZZER, "vcn_management": EXCEPTION_NO_FUZZER, "vibrator": EXCEPTION_NO_FUZZER, - "vibrator_control": EXCEPTION_NO_FUZZER, "vibrator_manager": EXCEPTION_NO_FUZZER, "virtualdevice": EXCEPTION_NO_FUZZER, "virtualdevice_native": EXCEPTION_NO_FUZZER, diff --git a/private/compat/34.0/34.0.ignore.cil b/private/compat/34.0/34.0.ignore.cil index 1949fd682..ca647f1a8 100644 --- a/private/compat/34.0/34.0.ignore.cil +++ b/private/compat/34.0/34.0.ignore.cil @@ -9,9 +9,9 @@ dtbo_block_device ota_build_prop snapuserd_log_data_file + fwk_vibrator_control_service hal_authgraph_service hal_secretkeeper_service - vibrator_control_service hal_codec2_service hal_macsec_service hal_threadnetwork_service diff --git a/private/service_contexts b/private/service_contexts index d1662e4cf..b78d82a73 100644 --- a/private/service_contexts +++ b/private/service_contexts @@ -2,6 +2,7 @@ android.frameworks.cameraservice.service.ICameraService/default u:object_r: android.frameworks.location.altitude.IAltitudeService/default u:object_r:fwk_altitude_service:s0 android.frameworks.stats.IStats/default u:object_r:fwk_stats_service:s0 android.frameworks.sensorservice.ISensorManager/default u:object_r:fwk_sensor_service:s0 +android.frameworks.vibrator.IVibratorControlService/default u:object_r:fwk_vibrator_control_service:s0 android.hardware.audio.core.IConfig/default u:object_r:hal_audio_service:s0 # 'default' IModule is equivalent to 'primary' in HIDL android.hardware.audio.core.IModule/default u:object_r:hal_audio_service:s0 @@ -438,7 +439,6 @@ user u:object_r:user_service:s0 uwb u:object_r:uwb_service:s0 vcn_management u:object_r:vcn_management_service:s0 vibrator u:object_r:vibrator_service:s0 -vibrator_control u:object_r:vibrator_control_service:s0 vibrator_manager u:object_r:vibrator_manager_service:s0 virtualdevice u:object_r:virtual_device_service:s0 virtualdevice_native u:object_r:virtual_device_native_service:s0 diff --git a/public/hal_vibrator.te b/public/hal_vibrator.te index 85b8e8cfa..6909ff2e6 100644 --- a/public/hal_vibrator.te +++ b/public/hal_vibrator.te @@ -14,4 +14,4 @@ allow hal_vibrator sysfs_vibrator:file rw_file_perms; allow hal_vibrator sysfs_vibrator:dir search; # Allow HAL vibrator to control some parameters of a vibration, such as scaling. -allow hal_vibrator vibrator_control_service:service_manager find; +allow hal_vibrator fwk_vibrator_control_service:service_manager find; diff --git a/public/service.te b/public/service.te index bc7d196b6..45e17e234 100644 --- a/public/service.te +++ b/public/service.te @@ -136,6 +136,7 @@ type fingerprint_service, app_api_service, system_server_service, service_manage type fwk_altitude_service, system_server_service, service_manager_type; type fwk_stats_service, app_api_service, system_server_service, service_manager_type; type fwk_sensor_service, system_server_service, service_manager_type; +type fwk_vibrator_control_service, system_server_service, service_manager_type; type game_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type gfxinfo_service, system_api_service, system_server_service, service_manager_type; type gnss_time_update_service, system_server_service, service_manager_type; @@ -255,7 +256,6 @@ type usb_service, app_api_service, system_server_service, service_manager_type; type user_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type uwb_service, app_api_service, system_server_service, service_manager_type; type vcn_management_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; -type vibrator_control_service, system_server_service, service_manager_type; type vibrator_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type vibrator_manager_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type virtual_device_service, app_api_service, system_server_service, service_manager_type;