Merge changes from topic 'health-hal' (1c3718b0) · Commits · e / os / android_hardware_interfaces

health/1.0/Android.bp

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		// This file is autogenerated by hidl-gen. Do not edit manually.

		genrule {
		name: "android.hardware.health@1.0_genc++",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.health@1.0",
		srcs: [
		"types.hal",
		"IHealth.hal",
		],
		out: [
		"android/hardware/health/1.0/types.cpp",
		"android/hardware/health/1.0/HealthAll.cpp",
		],
		}

		genrule {
		name: "android.hardware.health@1.0_genc++_headers",
		tools: ["hidl-gen"],
		cmd: "$(location hidl-gen) -o $(genDir) -Lc++ -randroid.hardware:hardware/interfaces android.hardware.health@1.0",
		srcs: [
		"types.hal",
		"IHealth.hal",
		],
		out: [
		"android/hardware/health/1.0/types.h",
		"android/hardware/health/1.0/IHealth.h",
		"android/hardware/health/1.0/IHwHealth.h",
		"android/hardware/health/1.0/BnHealth.h",
		"android/hardware/health/1.0/BpHealth.h",
		"android/hardware/health/1.0/BsHealth.h",
		],
		}

		cc_library_shared {
		name: "android.hardware.health@1.0",
		generated_sources: ["android.hardware.health@1.0_genc++"],
		generated_headers: ["android.hardware.health@1.0_genc++_headers"],
		export_generated_headers: ["android.hardware.health@1.0_genc++_headers"],
		shared_libs: [
		"libhidl",
		"libhwbinder",
		"libutils",
		"libcutils",
		],
		export_shared_lib_headers: [
		"libhidl",
		"libhwbinder",
		"libutils",
		],
		}

health/1.0/Android.mk

0 → 100644

+270 −0

Original line number	Diff line number	Diff line
		# This file is autogenerated by hidl-gen. Do not edit manually.

		LOCAL_PATH := $(call my-dir)

		################################################################################

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.health@1.0-java
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		intermediates := $(local-generated-sources-dir)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

		#
		# Build types.hal (BatteryHealth)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/BatteryHealth.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.BatteryHealth

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (BatteryStatus)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/BatteryStatus.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.BatteryStatus

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (HealthConfig)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/HealthConfig.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.HealthConfig

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (HealthInfo)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/HealthInfo.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.HealthInfo

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (Result)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/Result.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.Result

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build IHealth.hal
		#
		GEN := $(intermediates)/android/hardware/health/1.0/IHealth.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IHealth.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::IHealth

		$(GEN): $(LOCAL_PATH)/IHealth.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		include $(BUILD_JAVA_LIBRARY)


		################################################################################

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.health@1.0-java-static
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		intermediates := $(local-generated-sources-dir)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)

		#
		# Build types.hal (BatteryHealth)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/BatteryHealth.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.BatteryHealth

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (BatteryStatus)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/BatteryStatus.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.BatteryStatus

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (HealthConfig)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/HealthConfig.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.HealthConfig

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (HealthInfo)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/HealthInfo.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.HealthInfo

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build types.hal (Result)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/Result.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::types.Result

		$(GEN): $(LOCAL_PATH)/types.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)

		#
		# Build IHealth.hal
		#
		GEN := $(intermediates)/android/hardware/health/1.0/IHealth.java
		$(GEN): $(HIDL)
		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IHealth.hal
		$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0::IHealth

		$(GEN): $(LOCAL_PATH)/IHealth.hal
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		include $(BUILD_STATIC_JAVA_LIBRARY)


		################################################################################

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.health@1.0-java-constants
		LOCAL_MODULE_CLASS := JAVA_LIBRARIES

		intermediates := $(local-generated-sources-dir)

		HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
		#
		GEN := $(intermediates)/android/hardware/health/1.0/Constants.java
		$(GEN): $(HIDL)
		$(GEN): $(LOCAL_PATH)/types.hal
		$(GEN): $(LOCAL_PATH)/IHealth.hal

		$(GEN): PRIVATE_HIDL := $(HIDL)
		$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
		$(GEN): PRIVATE_CUSTOM_TOOL = \
		$(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
		-Ljava-constants -randroid.hardware:hardware/interfaces \
		android.hardware.health@1.0

		$(GEN):
		$(transform-generated-source)
		LOCAL_GENERATED_SOURCES += $(GEN)
		# Avoid dependency cycle of framework.jar -> this-library -> framework.jar
		LOCAL_NO_STANDARD_LIBRARIES := true
		LOCAL_JAVA_LIBRARIES := core-oj

		include $(BUILD_STATIC_JAVA_LIBRARY)



		include $(call all-makefiles-under,$(LOCAL_PATH))

health/1.0/IHealth.hal

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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.
		*/

		package android.hardware.health@1.0;

		interface IHealth {
		/**
		* This function lets you change healthd configuration from default if
		* desired. It must be called exactly once at startup time.
		*
		* The configuration values are described in 'struct HealthConfig'.
		* To use default configuration, simply return without modifying the
		* fields of the config parameter.
		*
		* @param default healthd configuration.
		*/
		init(HealthConfig config) generates (HealthConfig configOut);

		/**
		* This function is a hook to update/change device's HealthInfo (as described
		* in 'struct HealthInfo').
		*
		* 'HealthInfo' describes device's battery and charging status, typically
		* read from kernel. These values may be modified in this call.
		*
		* @param Device Health info as described in 'struct HealthInfo'.
		* @return skipLogging Indication to the caller to add 'or' skip logging the health
		* information. Return 'true' to skip logging the update.
		* @return infoOut HealthInfo to be sent to client code. (May or may
		* not be modified).
		*/
		update(HealthInfo info) generates (bool skipLogging, HealthInfo infoOut);

		/**
		* This function is called by healthd when framework queries for remaining
		* energy in the Battery through BatteryManager APIs.
		*
		* @return result Result of querying enery counter for the battery.
		* @return energy Battery remaining energy in nanowatt-hours.
		* Must be '0' if result is anything other than Result::SUCCESS.
		*/
		energyCounter() generates (Result result, int64_t energy);
		};

health/1.0/default/Android.mk

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		LOCAL_PATH := $(call my-dir)

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.health@1.0-impl
		LOCAL_MODULE_RELATIVE_PATH := hw
		LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include
		LOCAL_SRC_FILES := \
		Health.cpp \

		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libhidl \
		libhwbinder \
		liblog \
		libutils \
		android.hardware.health@1.0 \

		LOCAL_STATIC_LIBRARIES := android.hardware.health@1.0-convert

		LOCAL_HAL_STATIC_LIBRARIES := libhealthd

		include $(BUILD_SHARED_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_MODULE := android.hardware.health@1.0-convert
		LOCAL_SRC_FILES := convert.cpp
		LOCAL_C_INCLUDES := system/core/healthd/include system/core/base/include
		LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include
		LOCAL_SHARED_LIBRARIES := \
		libcutils \
		libhidl \
		libutils \
		android.hardware.health@1.0 \

		include $(BUILD_STATIC_LIBRARY)

		include $(CLEAR_VARS)
		LOCAL_MODULE_RELATIVE_PATH := hw
		LOCAL_MODULE := android.hardware.health@1.0-service
		LOCAL_INIT_RC := android.hardware.health@1.0-service.rc
		LOCAL_SRC_FILES := \
		HealthService.cpp \

		LOCAL_SHARED_LIBRARIES := \
		liblog \
		libcutils \
		libdl \
		libbase \
		libutils \
		libhwbinder \
		libhidl \
		android.hardware.health@1.0 \

		include $(BUILD_EXECUTABLE)

		include $(call first-makefiles-under,$(LOCAL_PATH))

health/1.0/default/Health.cpp

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2016 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-hal"

		#include <Health.h>
		#include <include/hal_conversion.h>

		namespace android {
		namespace hardware {
		namespace health {
		namespace V1_0 {
		namespace implementation {

		using ::android::hardware::health::V1_0::hal_conversion::convertToHealthConfig;
		using ::android::hardware::health::V1_0::hal_conversion::convertFromHealthConfig;
		using ::android::hardware::health::V1_0::hal_conversion::convertToHealthInfo;
		using ::android::hardware::health::V1_0::hal_conversion::convertFromHealthInfo;

		// Methods from ::android::hardware::health::V1_0::IHealth follow.
		Return<void> Health::init(const HealthConfig& config, init_cb _hidl_cb) {
		struct healthd_config healthd_config = {};
		HealthConfig configOut;

		// To keep working with existing healthd static HALs,
		// convert the new HealthConfig to the old healthd_config
		// and back.

		convertFromHealthConfig(config, &healthd_config);
		healthd_board_init(&healthd_config);
		mGetEnergyCounter = healthd_config.energyCounter;
		convertToHealthConfig(&healthd_config, configOut);

		_hidl_cb(configOut);

		return Void();
		}

		Return<void> Health::update(const HealthInfo& info, update_cb _hidl_cb) {
		struct android::BatteryProperties p = {};
		HealthInfo infoOut;

		// To keep working with existing healthd static HALs,
		// convert the new HealthInfo to android::Batteryproperties
		// and back.

		convertFromHealthInfo(info, &p);
		int skipLogging = healthd_board_battery_update(&p);
		convertToHealthInfo(&p, infoOut);

		_hidl_cb(!!skipLogging, infoOut);

		return Void();
		}

		Return<void> Health::energyCounter(energyCounter_cb _hidl_cb) {
		int64_t energy = 0;
		Result result = Result::NOT_SUPPORTED;

		if (mGetEnergyCounter) {
		int status = mGetEnergyCounter(&energy);
		if (status == 0) {
		result = Result::SUCCESS;
		}
		}

		_hidl_cb(result, energy);

		return Void();
		}

		IHealth* HIDL_FETCH_IHealth(const char* /* name */) {
		return new Health();
		}

		} // namespace implementation
		} // namespace V1_0
		} // namespace health
		} // namespace hardware
		} // namespace android