From a5556a989c0c6032dcd6bb0551d28369e3f241e0 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 19 Jan 2021 15:45:30 -0800 Subject: [PATCH] Remove health 1.0 IHealth. Test: TH Bug: 171260613 Change-Id: I3ac81d1d08a4329c90e99d74dc4adc10e875ab7b --- health/1.0/Android.bp | 1 - health/1.0/IHealth.hal | 56 --------------------- health/1.0/default/include/hal_conversion.h | 2 +- 3 files changed, 1 insertion(+), 58 deletions(-) delete mode 100644 health/1.0/IHealth.hal diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp index 7845871d6d..7786c08bdc 100644 --- a/health/1.0/Android.bp +++ b/health/1.0/Android.bp @@ -5,7 +5,6 @@ hidl_interface { root: "android.hardware", srcs: [ "types.hal", - "IHealth.hal", ], interfaces: [ "android.hidl.base@1.0", diff --git a/health/1.0/IHealth.hal b/health/1.0/IHealth.hal deleted file mode 100644 index 3828589159..0000000000 --- a/health/1.0/IHealth.hal +++ /dev/null @@ -1,56 +0,0 @@ -/* - * 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); -}; diff --git a/health/1.0/default/include/hal_conversion.h b/health/1.0/default/include/hal_conversion.h index a92b208354..a8ddb73544 100644 --- a/health/1.0/default/include/hal_conversion.h +++ b/health/1.0/default/include/hal_conversion.h @@ -17,7 +17,7 @@ #ifndef HARDWARE_INTERFACES_HEALTH_V1_0_DEFAULT_INCLUDE_HAL_CONVERSION_H_ #define HARDWARE_INTERFACES_HEALTH_V1_0_DEFAULT_INCLUDE_HAL_CONVERSION_H_ -#include +#include #include namespace android {