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

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

Refactor common code between healthd and health@2.0-service 

Use healthd_board_* functions for the
code that's different between them.

Bug: 65990106
Test: boots
Test: VTS tests on healthd and health service
Change-Id: I88e6f210cb91c0cf08a9d7c52910c38fa9a75130
parent 0700f3b8

healthd/Android.bp

+8 −2
Original line number Diff line number Diff line
@@ -53,7 +53,10 @@ cc_binary { 
    init_rc: ["android.hardware.health@2.0-service.rc"],

    vendor: true,

    relative_install_path: "hw",

    srcs: ["HealthService.cpp"],

    srcs: [

        "HealthServiceCommon.cpp",

        "HealthServiceDefault.cpp",

    ],



    cflags: ["-DHEALTH_INSTANCE_NAME=\"default\""],
@@ -77,7 +80,10 @@ cc_binary { 


cc_binary {

    name: "healthd",

    srcs: ["HealthService.cpp"],

    srcs: [

        "HealthServiceCommon.cpp",

        "HealthServiceHealthd.cpp",

    ],

    local_include_dirs: ["include"],



    cflags: ["-DHEALTH_INSTANCE_NAME=\"backup\""],

healthd/HealthService.cpp→healthd/HealthServiceCommon.cpp

+7 −13
Original line number Diff line number Diff line
@@ -44,21 +44,9 @@ static void binder_event(uint32_t /*epevents*/) { 
    IPCThreadState::self()->handlePolledCommands();

}



// TODO(b/67463967): healthd_board_* functions should be removed in health@2.0

int healthd_board_battery_update(struct android::BatteryProperties*)

{

    // return 0 to log periodic polled battery status to kernel log

    return 0;

}



void healthd_mode_service_2_0_init(struct healthd_config* config) {

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



    // Implementation-defined init logic goes here.

    // 1. config->periodic_chores_interval_* variables

    // 2. config->battery*Path variables

    // 3. config->energyCounter. In this implementation, energyCounter is not defined.



    configureRpcThreadpool(1, false /* callerWillJoin */);

    IPCThreadState::self()->disableBackgroundScheduling(true);

    IPCThreadState::self()->setupPolling(&gBinderFd);
@@ -68,6 +56,13 @@ void healthd_mode_service_2_0_init(struct healthd_config* config) { 
            LOG(ERROR) << LOG_TAG << ": Register for binder events failed";

    }



    // Implementation-defined init logic goes here.

    // 1. config->periodic_chores_interval_* variables

    // 2. config->battery*Path variables

    // 3. config->energyCounter. In this implementation, energyCounter is not defined.

    // TODO(b/68724651): healthd_board_* functions should be removed in health@2.0

    healthd_board_init(config);



    gHealth = new ::android::hardware::health::V2_0::implementation::Health(config);

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

        << LOG_TAG << ": Failed to register HAL";
@@ -85,7 +80,6 @@ void healthd_mode_service_2_0_heartbeat(void) { 
}



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



    // Implementation-defined update logic goes here. An implementation

    // can make modifications to prop before broadcasting it to all callbacks.

healthd/HealthServiceDefault.cpp

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



#include <healthd/healthd.h>



void healthd_board_init(struct healthd_config*) {

    // use defaults

}



int healthd_board_battery_update(struct android::BatteryProperties*) {

    // return 0 to log periodic polled battery status to kernel log

    return 0;

}

healthd/HealthServiceHealthd.cpp

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 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.

 */



#include <healthd/healthd.h>



void healthd_board_init(struct healthd_config*) {

    // use defaults

}



int healthd_board_battery_update(struct android::BatteryProperties*) {

    // return 0 to log periodic polled battery status to kernel log

    return 0;

}