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

Commit affa24f2 authored by Yifan Hong's avatar Yifan Hong
Browse files

healthd: move HealthServiceCommon 

... to hardware/interfaces. HealthServiceCommon
becomes two separate libraries:
- libhealthservicedefault for services on vendor
- libhealthservicehealthd for healthd

Test: boots
Bug: 63702641
Change-Id: Ibc7096328bb36356cb653e542bab900cd046fe8a
parent 1c08d504

healthd/Android.bp

+2 −4
Original line number Diff line number Diff line
@@ -26,12 +26,10 @@ cc_binary { 
    vendor: true,

    relative_install_path: "hw",

    srcs: [

        "HealthServiceCommon.cpp",

        "HealthServiceDefault.cpp",

    ],



    cflags: [

        "-DHEALTH_INSTANCE_NAME=\"default\"",

        "-Wall",

        "-Werror",

    ],
@@ -39,6 +37,7 @@ cc_binary { 
    static_libs: [

        "android.hardware.health@2.0-impl",

        "android.hardware.health@1.0-convert",

        "libhealthservice",

        "libhealthstoragedefault",

        "libbatterymonitor",

    ],
@@ -58,13 +57,11 @@ cc_binary { 
cc_binary {

    name: "healthd",

    srcs: [

        "HealthServiceCommon.cpp",

        "HealthServiceHealthd.cpp",

    ],

    local_include_dirs: ["include"],



    cflags: [

        "-DHEALTH_INSTANCE_NAME=\"backup\"",

        "-Wall",

        "-Werror",

    ],
@@ -72,6 +69,7 @@ cc_binary { 
    static_libs: [

        "android.hardware.health@2.0-impl",

        "android.hardware.health@1.0-convert",

        "libhealthservice",

        "libbatterymonitor",

        "libhealthstoragedefault",

    ],

healthd/HealthServiceCommon.cpp

deleted100644 → 0
+0 −89
Original line number Diff line number Diff line 
/*

 * Copyright 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



// This is a reference implementation for health@2.0 HAL. A vendor

// can write its own HealthService.cpp with customized init and update functions.



#define LOG_TAG "health@2.0/" HEALTH_INSTANCE_NAME

#include <android-base/logging.h>



#include <android/hardware/health/1.0/types.h>

#include <hal_conversion.h>

#include <health2/Health.h>

#include <healthd/healthd.h>

#include <hidl/HidlTransportSupport.h>



using android::hardware::IPCThreadState;

using android::hardware::configureRpcThreadpool;

using android::hardware::handleTransportPoll;

using android::hardware::setupTransportPolling;

using android::hardware::health::V2_0::HealthInfo;

using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;

using android::hardware::health::V2_0::IHealth;

using android::hardware::health::V2_0::implementation::Health;



extern int healthd_main(void);



static int gBinderFd = -1;



static void binder_event(uint32_t /*epevents*/) {

    if (gBinderFd >= 0) handleTransportPoll(gBinderFd);

}



void healthd_mode_service_2_0_init(struct healthd_config* config) {

    LOG(INFO) << LOG_TAG << " Hal is starting up...";



    gBinderFd = setupTransportPolling();



    if (gBinderFd >= 0) {

        if (healthd_register_event(gBinderFd, binder_event))

            LOG(ERROR) << LOG_TAG << ": Register for binder events failed";

    }



    android::sp<IHealth> service = Health::initInstance(config);

    CHECK_EQ(service->registerAsService(HEALTH_INSTANCE_NAME), android::OK)

        << LOG_TAG << ": Failed to register HAL";



    LOG(INFO) << LOG_TAG << ": Hal init done";

}



int healthd_mode_service_2_0_preparetowait(void) {

    IPCThreadState::self()->flushCommands();

    return -1;

}



void healthd_mode_service_2_0_heartbeat(void) {

    // noop

}



void healthd_mode_service_2_0_battery_update(struct android::BatteryProperties* prop) {

    HealthInfo info;

    convertToHealthInfo(prop, info.legacy);

    Health::getImplementation()->notifyListeners(&info);

}



static struct healthd_mode_ops healthd_mode_service_2_0_ops = {

    .init = healthd_mode_service_2_0_init,

    .preparetowait = healthd_mode_service_2_0_preparetowait,

    .heartbeat = healthd_mode_service_2_0_heartbeat,

    .battery_update = healthd_mode_service_2_0_battery_update,

};



int main() {

    healthd_mode_ops = &healthd_mode_service_2_0_ops;

    LOG(INFO) << LOG_TAG << ": Hal starting main loop...";

    return healthd_main();

}

healthd/HealthServiceDefault.cpp

+5 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 * limitations under the License.

 */



#include <health2/service.h>

#include <healthd/healthd.h>



void healthd_board_init(struct healthd_config*) {
@@ -32,3 +33,7 @@ int healthd_board_battery_update(struct android::BatteryProperties*) { 
    // return 0 to log periodic polled battery status to kernel log

    return 0;

}



int main() {

    return health_service_main();

}

healthd/HealthServiceHealthd.cpp

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <android/hardware/health/1.0/IHealth.h>

#include <android/hardware/health/1.0/types.h>

#include <hal_conversion.h>

#include <health2/service.h>

#include <healthd/healthd.h>

#include <hidl/HidlTransportSupport.h>
@@ -86,3 +87,7 @@ int healthd_board_battery_update(struct android::BatteryProperties* props) { 


    return logthis;

}



int main() {

    return health_service_main("backup");

}