Skip to content
Snippets Groups Projects
Commit 8c8eb69f authored by Wei Wang's avatar Wei Wang
Browse files

Revert "Move thermal service into system_server"

This reverts commit 461d91fe.

Reason for revert: breaks git_pi-dev-plus-aosp

Change-Id: I8a42dc040a112f0774f31486a8da2a26e1e68a30
parent 7e6438b3
No related branches found
No related tags found
No related merge requests found
...@@ -14,8 +14,6 @@ ...@@ -14,8 +14,6 @@
(type thermalcallback_hwservice) (type thermalcallback_hwservice)
(type untrusted_v2_app) (type untrusted_v2_app)
(type vcs_device) (type vcs_device)
(type thermalserviced)
(type thermalserviced_exec)
;; Public 28.0 SEPolicy is divergent on different devices w.r.t ;; Public 28.0 SEPolicy is divergent on different devices w.r.t
;; exported_audio_prop type. We need this typeattribute declaration so that the ;; exported_audio_prop type. We need this typeattribute declaration so that the
...@@ -740,6 +738,8 @@ ...@@ -740,6 +738,8 @@
(expandtypeattribute (textservices_service_28_0) true) (expandtypeattribute (textservices_service_28_0) true)
(expandtypeattribute (thermalcallback_hwservice_28_0) true) (expandtypeattribute (thermalcallback_hwservice_28_0) true)
(expandtypeattribute (thermal_service_28_0) true) (expandtypeattribute (thermal_service_28_0) true)
(expandtypeattribute (thermalserviced_28_0) true)
(expandtypeattribute (thermalserviced_exec_28_0) true)
(expandtypeattribute (timezone_service_28_0) true) (expandtypeattribute (timezone_service_28_0) true)
(expandtypeattribute (tmpfs_28_0) true) (expandtypeattribute (tmpfs_28_0) true)
(expandtypeattribute (tombstoned_28_0) true) (expandtypeattribute (tombstoned_28_0) true)
...@@ -1603,6 +1603,8 @@ ...@@ -1603,6 +1603,8 @@
(typeattributeset textservices_service_28_0 (textservices_service)) (typeattributeset textservices_service_28_0 (textservices_service))
(typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice)) (typeattributeset thermalcallback_hwservice_28_0 (thermalcallback_hwservice))
(typeattributeset thermal_service_28_0 (thermal_service)) (typeattributeset thermal_service_28_0 (thermal_service))
(typeattributeset thermalserviced_28_0 (thermalserviced))
(typeattributeset thermalserviced_exec_28_0 (thermalserviced_exec))
(typeattributeset timezone_service_28_0 (timezone_service)) (typeattributeset timezone_service_28_0 (timezone_service))
(typeattributeset tmpfs_28_0 (tmpfs)) (typeattributeset tmpfs_28_0 (tmpfs))
(typeattributeset tombstoned_28_0 (tombstoned)) (typeattributeset tombstoned_28_0 (tombstoned))
......
...@@ -276,6 +276,7 @@ ...@@ -276,6 +276,7 @@
/system/bin/update_engine u:object_r:update_engine_exec:s0 /system/bin/update_engine u:object_r:update_engine_exec:s0
/system/bin/bspatch u:object_r:update_engine_exec:s0 /system/bin/bspatch u:object_r:update_engine_exec:s0
/system/bin/storaged u:object_r:storaged_exec:s0 /system/bin/storaged u:object_r:storaged_exec:s0
/system/bin/thermalserviced u:object_r:thermalserviced_exec:s0
/system/bin/wpantund u:object_r:wpantund_exec:s0 /system/bin/wpantund u:object_r:wpantund_exec:s0
/system/bin/virtual_touchpad u:object_r:virtual_touchpad_exec:s0 /system/bin/virtual_touchpad u:object_r:virtual_touchpad_exec:s0
/system/bin/hw/android\.frameworks\.bufferhub@1\.0-service u:object_r:fwk_bufferhub_exec:s0 /system/bin/hw/android\.frameworks\.bufferhub@1\.0-service u:object_r:fwk_bufferhub_exec:s0
......
...@@ -687,6 +687,7 @@ allow system_server netd_service:service_manager find; ...@@ -687,6 +687,7 @@ allow system_server netd_service:service_manager find;
allow system_server nfc_service:service_manager find; allow system_server nfc_service:service_manager find;
allow system_server radio_service:service_manager find; allow system_server radio_service:service_manager find;
allow system_server stats_service:service_manager find; allow system_server stats_service:service_manager find;
allow system_server thermal_service:service_manager find;
allow system_server storaged_service:service_manager find; allow system_server storaged_service:service_manager find;
allow system_server surfaceflinger_service:service_manager find; allow system_server surfaceflinger_service:service_manager find;
allow system_server update_engine_service:service_manager find; allow system_server update_engine_service:service_manager find;
......
typeattribute thermalserviced coredomain;
init_daemon_domain(thermalserviced)
...@@ -29,6 +29,7 @@ type secure_element_service, service_manager_type; ...@@ -29,6 +29,7 @@ type secure_element_service, service_manager_type;
type storaged_service, service_manager_type; type storaged_service, service_manager_type;
type surfaceflinger_service, app_api_service, ephemeral_app_api_service, service_manager_type; type surfaceflinger_service, app_api_service, ephemeral_app_api_service, service_manager_type;
type system_app_service, service_manager_type; type system_app_service, service_manager_type;
type thermal_service, service_manager_type;
type update_engine_service, service_manager_type; type update_engine_service, service_manager_type;
type virtual_touchpad_service, service_manager_type; type virtual_touchpad_service, service_manager_type;
type vold_service, service_manager_type; type vold_service, service_manager_type;
...@@ -152,7 +153,6 @@ type task_service, system_server_service, service_manager_type; ...@@ -152,7 +153,6 @@ type task_service, system_server_service, service_manager_type;
type textclassification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type textclassification_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type textservices_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type textservices_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type telecom_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type; type telecom_service, app_api_service, ephemeral_app_api_service, system_server_service, service_manager_type;
type thermal_service, system_server_service, service_manager_type;
type timedetector_service, system_server_service, service_manager_type; type timedetector_service, system_server_service, service_manager_type;
type timezone_service, system_server_service, service_manager_type; type timezone_service, system_server_service, service_manager_type;
type timezonedetector_service, system_server_service, service_manager_type; type timezonedetector_service, system_server_service, service_manager_type;
......
# thermalserviced -- thermal management services for system and vendor
type thermalserviced, domain;
type thermalserviced_exec, system_file_type, exec_type, file_type;
binder_use(thermalserviced)
binder_service(thermalserviced)
add_service(thermalserviced, thermal_service)
hwbinder_use(thermalserviced)
hal_client_domain(thermalserviced, hal_thermal)
add_hwservice(thermalserviced, thermalcallback_hwservice)
binder_call(thermalserviced, platform_app)
binder_call(thermalserviced, system_server)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment