Mark batteryproperties service as app_api_service.
Applications do not explicitly request handles to the batteryproperties
service, but the BatteryManager obtains a reference to it and uses it
for its underlying property queries. Mark it as an app_api_service so
that all applications may use this API. Also remove the batterypropreg
service label, as this does not appear to be used and may have been a
duplication of batteryproperties. As a result, remove the
healthd_service type and replace it with a more specific
batteryproperties_service type.
(cherry-picked from commit: 9ed71eff4b
)
Bug: 27442760
Change-Id: I537c17c09145b302728377bf856c1147e4cc37e9
This commit is contained in:
parent
d79d753ac2
commit
027ec20696
5 changed files with 4 additions and 6 deletions
|
@ -41,7 +41,7 @@ allow healthd self:process execmem;
|
|||
allow healthd proc_sysrq:file rw_file_perms;
|
||||
allow healthd self:capability sys_boot;
|
||||
|
||||
allow healthd healthd_service:service_manager { add find };
|
||||
allow healthd batteryproperties_service:service_manager { add find };
|
||||
|
||||
# Healthd needs to tell init to continue the boot
|
||||
# process when running in charger mode.
|
||||
|
|
|
@ -5,7 +5,7 @@ type default_android_service, service_manager_type;
|
|||
type drmserver_service, service_manager_type;
|
||||
type gatekeeper_service, app_api_service, service_manager_type;
|
||||
type fingerprintd_service, service_manager_type;
|
||||
type healthd_service, service_manager_type;
|
||||
type batteryproperties_service, app_api_service, service_manager_type;
|
||||
type inputflinger_service, service_manager_type;
|
||||
type keystore_service, service_manager_type;
|
||||
type mediaserver_service, service_manager_type;
|
||||
|
|
|
@ -10,8 +10,7 @@ appwidget u:object_r:appwidget_service:s0
|
|||
assetatlas u:object_r:assetatlas_service:s0
|
||||
audio u:object_r:audio_service:s0
|
||||
backup u:object_r:backup_service:s0
|
||||
batteryproperties u:object_r:healthd_service:s0
|
||||
batterypropreg u:object_r:healthd_service:s0
|
||||
batteryproperties u:object_r:batteryproperties_service:s0
|
||||
batterystats u:object_r:batterystats_service:s0
|
||||
battery u:object_r:battery_service:s0
|
||||
bluetooth_manager u:object_r:bluetooth_manager_service:s0
|
||||
|
|
|
@ -403,7 +403,7 @@ allow system_server sysfs_zram:file r_file_perms;
|
|||
allow system_server audioserver_service:service_manager find;
|
||||
allow system_server cameraserver_service:service_manager find;
|
||||
allow system_server drmserver_service:service_manager find;
|
||||
allow system_server healthd_service:service_manager find;
|
||||
allow system_server batteryproperties_service:service_manager find;
|
||||
allow system_server keystore_service:service_manager find;
|
||||
allow system_server gatekeeper_service:service_manager find;
|
||||
allow system_server fingerprintd_service:service_manager find;
|
||||
|
|
|
@ -69,7 +69,6 @@ allow untrusted_app servicemanager:service_manager list;
|
|||
allow untrusted_app audioserver_service:service_manager find;
|
||||
allow untrusted_app cameraserver_service:service_manager find;
|
||||
allow untrusted_app drmserver_service:service_manager find;
|
||||
allow untrusted_app healthd_service:service_manager find;
|
||||
allow untrusted_app mediaserver_service:service_manager find;
|
||||
allow untrusted_app mediaextractor_service:service_manager find;
|
||||
allow untrusted_app mediacodec_service:service_manager find;
|
||||
|
|
Loading…
Reference in a new issue