Merge changes from topic "health2-health1" (667622fc) · Commits · e / os / android_system_core

healthd/Android.bp

+9 −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\""],
		@@ -96,6 +102,7 @@ cc_binary {
		"libhwbinder",
		"liblog",
		"libutils",
		"android.hardware.health@1.0",
		"android.hardware.health@2.0",
		],

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

+88 −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.
		*/

		#define LOG_TAG "healthd"
		#include <android-base/logging.h>

		#include <android/hardware/health/1.0/IHealth.h>
		#include <android/hardware/health/1.0/types.h>
		#include <hal_conversion.h>
		#include <healthd/healthd.h>
		#include <hidl/HidlTransportSupport.h>

		using android::OK;
		using android::NAME_NOT_FOUND;
		using android::hardware::health::V1_0::HealthConfig;
		using android::hardware::health::V1_0::HealthInfo;
		using android::hardware::health::V1_0::Result;
		using android::hardware::health::V1_0::hal_conversion::convertFromHealthConfig;
		using android::hardware::health::V1_0::hal_conversion::convertToHealthConfig;
		using android::hardware::health::V1_0::hal_conversion::convertFromHealthInfo;
		using android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;

		using IHealthLegacy = android::hardware::health::V1_0::IHealth;

		static android::sp<IHealthLegacy> gHealth_1_0;

		static int healthd_board_get_energy_counter(int64_t* energy) {
		if (gHealth_1_0 == nullptr) {
		return NAME_NOT_FOUND;
		}

		Result result = Result::NOT_SUPPORTED;
		gHealth_1_0->energyCounter([energy, &result](Result ret, int64_t energyOut) {
		result = ret;
		*energy = energyOut;
		});

		return result == Result::SUCCESS ? OK : NAME_NOT_FOUND;
		}

		void healthd_board_init(struct healthd_config* config) {
		gHealth_1_0 = IHealthLegacy::getService();

		if (gHealth_1_0 == nullptr) {
		return;
		}

		HealthConfig halConfig{};
		convertToHealthConfig(config, halConfig);
		gHealth_1_0->init(halConfig, [config](const auto& halConfigOut) {
		convertFromHealthConfig(halConfigOut, config);
		// always redirect energy counter queries
		config->energyCounter = healthd_board_get_energy_counter;
		});
		LOG(INFO) << LOG_TAG << ": redirecting calls to 1.0 health HAL";
		}

		// TODO(b/68724651): Move this function into healthd_mode_service_2_0_battery_update
		// with logthis returned.
		int healthd_board_battery_update(struct android::BatteryProperties* props) {
		int logthis = 0;

		if (gHealth_1_0 == nullptr) {
		return logthis;
		}

		HealthInfo info;
		convertToHealthInfo(props, info);
		gHealth_1_0->update(info, [props, &logthis](int32_t ret, const auto& infoOut) {
		logthis = ret;
		convertFromHealthInfo(infoOut, props);
		});

		return logthis;
		}