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

Commit 4ad11a94 authored by Yifan Hong's avatar Yifan Hong
Browse files

health: move duplicate HealthServiceCommon 

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

Test: boots
Bug: 63702641
Change-Id: I40235cef7d4fa62103629bf507b0401e3f939654
parent 75a2fb54

health/2.0/utils/libhealthservice/Android.bp

0 → 100644
+29 −0
Original line number Diff line number Diff line 
// Reasonable defaults for android.hardware.health@2.0-service.<device>.

// Vendor service can customize by implementing functions defined in

// libhealthd and libhealthstoragedefault.





cc_library_static {

    name: "libhealthservice",

    vendor_available: true,

    srcs: ["HealthServiceCommon.cpp"],



    export_include_dirs: ["include"],



    cflags: [

        "-Wall",

        "-Werror",

    ],

    shared_libs: [

        "android.hardware.health@2.0",

    ],

    static_libs: [

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

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

    ],

    export_static_lib_headers: [

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

    ],

    header_libs: ["libhealthd_headers"],

    export_header_lib_headers: ["libhealthd_headers"],

}

health/2.0/utils/libhealthservice/HealthServiceCommon.cpp

0 → 100644
+92 −0
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.

 */



#define LOG_TAG "health@2.0/"

#include <android-base/logging.h>



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

#include <hal_conversion.h>

#include <health2/Health.h>

#include <health2/service.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 std::string gInstanceName;



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 << gInstanceName << " Hal is starting up...";



    gBinderFd = setupTransportPolling();



    if (gBinderFd >= 0) {

        if (healthd_register_event(gBinderFd, binder_event))

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

    }



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

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

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



    LOG(INFO) << LOG_TAG << gInstanceName << ": 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 health_service_main(const char* instance) {

    gInstanceName = instance;

    if (gInstanceName.empty()) {

        gInstanceName = "default";

    }

    healthd_mode_ops = &healthd_mode_service_2_0_ops;

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

    return healthd_main();

}

health/2.0/utils/libhealthservice/include/health2/service.h

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

 * Copyright 2018 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.

 */



#ifndef ANDROID_HARDWARE_HEALTH_V2_0_SERVICE_COMMON

#define ANDROID_HARDWARE_HEALTH_V2_0_SERVICE_COMMON



int health_service_main(const char* instance = "");



#endif  // ANDROID_HARDWARE_HEALTH_V2_0_SERVICE_COMMON