Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 056ffd93 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge changes from topic "health_charger" 

* changes:
  Update health 2.1 README for non A/B devices.
  Add default health 2.1 service to class charger
parents 60cbc455 b9c40820

health/2.1/README.md

+17 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,9 @@ 
        ```mk

        ```mk

        # Install default passthrough implementation to vendor.

        # Install default passthrough implementation to vendor.

        PRODUCT_PACKAGES += android.hardware.health@2.1-impl

        PRODUCT_PACKAGES += android.hardware.health@2.1-impl



        # For non-A/B devices, install default passthrough implementation to recovery.

        PRODUCT_PACKAGES += android.hardware.health@2.1-impl.recovery

        ```

        ```





        You are done. Otherwise, go to the next step.

        You are done. Otherwise, go to the next step.
@@ -42,6 +45,8 @@ 
              implementation, See

              implementation, See

              [Upgrading from Health HAL 2.0](#update-from-2-0).

              [Upgrading from Health HAL 2.0](#update-from-2-0).





        1. [Install the implementation](#install).



        1. [Update necessary SELinux permissions](#selinux).

        1. [Update necessary SELinux permissions](#selinux).





        1. [Fix `/charger` symlink](#charger-symlink).

        1. [Fix `/charger` symlink](#charger-symlink).
@@ -95,6 +100,18 @@ and `update()`, with an additional `energyCounter()` function. 
  `HealthImpl::getHealthInfo` or `HealthImpl::getHealthInfo_2_1` because they call

  `HealthImpl::getHealthInfo` or `HealthImpl::getHealthInfo_2_1` because they call

  `getDiskStats` and `getStorageInfo` to retrieve storage information.

  `getDiskStats` and `getStorageInfo` to retrieve storage information.





# Install the implementation {#install}



In `device.mk`:



```mk

# Install the passthrough implementation to vendor.

PRODUCT_PACKAGES += android.hardware.health@2.1-impl-<device>



# For non-A/B devices, also install the passthrough implementation to recovery.

PRODUCT_PACKAGES += android.hardware.health@2.1-impl-<device>.recovery

```



# Update necessary SELinux permissions {#selinux}

# Update necessary SELinux permissions {#selinux}





For example (replace `<device>` with the device name):

For example (replace `<device>` with the device name):

health/2.1/default/android.hardware.health@2.1-service.rc

+1 −1
Original line number Original line Diff line number Diff line 
service health-hal-2-1 /vendor/bin/hw/android.hardware.health@2.1-service

service health-hal-2-1 /vendor/bin/hw/android.hardware.health@2.1-service

    class hal

    class hal charger

    user system

    user system

    group system

    group system

    capabilities WAKE_ALARM

    capabilities WAKE_ALARM