From 64345cd628e0d2e7174f4134b7083b19c73cefed Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Wed, 26 Jan 2022 15:51:58 -0800 Subject: [PATCH] health: vendor.charger-* -> vendor.charger. Devices may have actions triggered by init.svc.vendor.charger. If the name is changed, these actions are not triggered properly. The name is usually vendor.charger, so the default service will also use vendor.charger as the name. Test: none Bug: 215152892 Change-Id: Icb296ae82a6f3472730fdb3abc35dcede22889e7 --- health/aidl/README.md | 14 ++++++++++++-- .../android.hardware.health-service.example.rc | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/health/aidl/README.md b/health/aidl/README.md index a64fe93f69..54d6758958 100644 --- a/health/aidl/README.md +++ b/health/aidl/README.md @@ -60,7 +60,11 @@ service in [android.hardware.health-service.example.rc](default/android.hardware.health-service.example.rc). Specifically: -* You may ignore the `service` line. The name of the service does not matter. +* For the `service` line, if the name of the service is **NOT** + `vendor.charger`, and there are actions + in the rc file triggered by `on property:init.svc.=running` where + `` is the name of your charger service, then you need a custom health + AIDL service. * If your service belongs to additional classes beside `charger`, you need a custom health AIDL service. * Modify the `seclabel` line. Replace `charger` with `charger_vendor`. @@ -232,13 +236,19 @@ PRODUCT_PACKAGES += charger_res_images_vendor It is recommended that you move the existing `service` entry with `class charger` to the `init.rc` file in your custom health service. +If there are existing actions in the rc file triggered by +`on property:init.svc.=running`, where `` is the name of your +existing charger service (usually `vendor.charger`), then the name of the +service must be kept as-is. If you modify the name of the service, the actions +are not triggered properly. + Modify the entry to invoke the health service binary with `--charger` argument. See [android.hardware.health-service.example.rc](default/android.hardware.health-service.example.rc) for an example: ```text -service vendor.charger-tuna /vendor/bin/hw/android.hardware.health-service-tuna --charger +service vendor.charger /vendor/bin/hw/android.hardware.health-service-tuna --charger class charger seclabel u:r:charger_vendor:s0 # ... diff --git a/health/aidl/default/android.hardware.health-service.example.rc b/health/aidl/default/android.hardware.health-service.example.rc index 4258890485..e052024e42 100644 --- a/health/aidl/default/android.hardware.health-service.example.rc +++ b/health/aidl/default/android.hardware.health-service.example.rc @@ -5,7 +5,7 @@ service vendor.health-default /vendor/bin/hw/android.hardware.health-service.exa capabilities WAKE_ALARM BLOCK_SUSPEND file /dev/kmsg w -service vendor.charger-default /vendor/bin/hw/android.hardware.health-service.example --charger +service vendor.charger /vendor/bin/hw/android.hardware.health-service.example --charger class charger seclabel u:r:charger_vendor:s0 user system