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

Commit 0088b167 authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Remove health 1.0 IHealth." am: ddb407f1 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1554270

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I15f26f660499e8bdeea8961f85326c6d7102f0a3
parents 98ff6431 ddb407f1

health/1.0/Android.bp

+0 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,6 @@ hidl_interface { 
    root: "android.hardware",

    root: "android.hardware",

    srcs: [

    srcs: [

        "types.hal",

        "types.hal",

        "IHealth.hal",

    ],

    ],

    interfaces: [

    interfaces: [

        "android.hidl.base@1.0",

        "android.hidl.base@1.0",

health/1.0/IHealth.hal

deleted100644 → 0
+0 −56
Original line number Original line 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/include/hal_conversion.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,7 @@ 
#ifndef HARDWARE_INTERFACES_HEALTH_V1_0_DEFAULT_INCLUDE_HAL_CONVERSION_H_

#ifndef HARDWARE_INTERFACES_HEALTH_V1_0_DEFAULT_INCLUDE_HAL_CONVERSION_H_

#define HARDWARE_INTERFACES_HEALTH_V1_0_DEFAULT_INCLUDE_HAL_CONVERSION_H_

#define HARDWARE_INTERFACES_HEALTH_V1_0_DEFAULT_INCLUDE_HAL_CONVERSION_H_





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

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

#include <healthd/healthd.h>

#include <healthd/healthd.h>





namespace android {

namespace android {