author | Treehugger Robot <treehugger-gerrit@google.com> | |
Thu, 12 Oct 2017 01:47:57 +0000 (01:47 +0000) | ||
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | |
Thu, 12 Oct 2017 01:47:57 +0000 (01:47 +0000) |
health/2.0/Android.bp | patch | blob | history | |
health/2.0/Android.mk | [deleted file] | patch | blob | history |
health/2.0/IHealthInfoCallback.hal | patch | blob | history | |
health/2.0/types.hal | patch | blob | history |
diff --git a/health/2.0/Android.bp b/health/2.0/Android.bp
index f9444711dab6d287c218604afdd1b1b0c7b2979e..8281a84e5b704b25e81f59e9ff3a12014c4bb007 100644 (file)
--- a/health/2.0/Android.bp
+++ b/health/2.0/Android.bp
],
}
+genrule {
+ name: "android.hardware.health-V2.0-java_gen_java",
+ tools: ["hidl-gen"],
+ cmd: "$(location hidl-gen) -o $(genDir) -Ljava -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.health@2.0",
+ srcs: [
+ ":android.hardware.health@2.0_hal",
+ ],
+ out: [
+ "android/hardware/health/V2_0/HealthInfo.java",
+ "android/hardware/health/V2_0/Result.java",
+ "android/hardware/health/V2_0/IHealth.java",
+ "android/hardware/health/V2_0/IHealthInfoCallback.java",
+ ],
+}
+
+java_library {
+ name: "android.hardware.health-V2.0-java",
+ no_framework_libs: true,
+ defaults: ["hidl-java-module-defaults"],
+ srcs: [":android.hardware.health-V2.0-java_gen_java"],
+ libs: [
+ "hwbinder",
+ "android.hardware.health-V1.0-java",
+ "android.hidl.base-V1.0-java",
+ ]
+}
+
+// This package does not export any types. Not creating java constants export.
+
+
genrule {
name: "android.hardware.health@2.0-adapter-helper_genc++",
tools: ["hidl-gen"],
],
}
-
cc_library {
name: "android.hardware.health@2.0-adapter-helper",
defaults: ["hidl-module-defaults"],
diff --git a/health/2.0/Android.mk b/health/2.0/Android.mk
--- a/health/2.0/Android.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-# This file is autogenerated by hidl-gen. Do not edit manually.
-
-LOCAL_PATH := $(call my-dir)
-
-################################################################################
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := android.hardware.health-V2.0-java
-LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-
-intermediates := $(call local-generated-sources-dir, COMMON)
-
-HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
-
-LOCAL_JAVA_LIBRARIES := \
- android.hardware.health-V1.0-java \
- android.hidl.base-V1.0-java \
-
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES += core-oj hwbinder
-
-#
-# Build types.hal (Result)
-#
-GEN := $(intermediates)/android/hardware/health/V2_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 \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.health@2.0::types.Result
-
-$(GEN): $(LOCAL_PATH)/types.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IHealth.hal
-#
-GEN := $(intermediates)/android/hardware/health/V2_0/IHealth.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IHealth.hal
-$(GEN): PRIVATE_DEPS += $(LOCAL_PATH)/IHealthInfoCallback.hal
-$(GEN): $(LOCAL_PATH)/IHealthInfoCallback.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 \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.health@2.0::IHealth
-
-$(GEN): $(LOCAL_PATH)/IHealth.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-
-#
-# Build IHealthInfoCallback.hal
-#
-GEN := $(intermediates)/android/hardware/health/V2_0/IHealthInfoCallback.java
-$(GEN): $(HIDL)
-$(GEN): PRIVATE_HIDL := $(HIDL)
-$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/IHealthInfoCallback.hal
-$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
- $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \
- -Ljava \
- -randroid.hardware:hardware/interfaces \
- -randroid.hidl:system/libhidl/transport \
- android.hardware.health@2.0::IHealthInfoCallback
-
-$(GEN): $(LOCAL_PATH)/IHealthInfoCallback.hal
- $(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
-include $(BUILD_JAVA_LIBRARY)
-
-
-
-include $(call all-makefiles-under,$(LOCAL_PATH))
index 8e17bb96bc31793f184eac33b985329b4ad6494b..15352ee4b188f90bffe870b8485eb3947613bad5 100644 (file)
package android.hardware.health@2.0;
-import @1.0::HealthInfo;
-
/**
* IHealthInfoCallback is the callback interface to
* {@link IHealthInfoBus.registerCallback}.
diff --git a/health/2.0/types.hal b/health/2.0/types.hal
index 89ea44486d836294835ba78b2f574b6abd80068c..0d17f9fe05440e5ce0978948ffd26bf6f8c4d44e 100644 (file)
--- a/health/2.0/types.hal
+++ b/health/2.0/types.hal
package android.hardware.health@2.0;
+import @1.0::HealthInfo;
import @1.0::Result;
/**
NOT_FOUND,
CALLBACK_DIED,
};
+
+struct HealthInfo {
+ /**
+ * Legacy information from 1.0 HAL.
+ *
+ * If a value is not available, it must be set to 0, UNKNOWN, or empty
+ * string.
+ */
+ @1.0::HealthInfo legacy;
+
+ /**
+ * Average battery current in microamperes. Positive
+ * values indicate net current entering the battery from a charge source,
+ * negative values indicate net current discharging from the battery.
+ * The time period over which the average is computed may depend on the
+ * fuel gauge hardware and its configuration.
+ *
+ * If this value is not available, it must be set to 0.
+ */
+ int32_t batteryCurrentAverage;
+
+ /**
+ * Remaining battery capacity percentage of total capacity
+ * (with no fractional part). This value must be in the range 0-100
+ * (inclusive).
+ *
+ * If this value is not available, it must be set to 0.
+ */
+ int32_t batteryCapacity;
+
+ /**
+ * Battery remaining energy in nanowatt-hours.
+ *
+ * If this value is not available, it must be set to 0.
+ */
+ int64_t energyCounter;
+};
\ No newline at end of file