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

Commit 972a950e authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "health: expose battery health data and update version to V2" am:... 

Merge "health: expose battery health data and update version to V2" am: 9a484aa9 am: b1334964 am: 4ca56d94

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



Change-Id: I55e64b31c41915237c7e6dd8ef799bf6fcd38f4d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14cc011b 4ca56d94

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ 
    </hal>

    <hal format="aidl" optional="false">

        <name>android.hardware.health</name>

        <version>1</version>

        <version>1-2</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

health/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ cc_library { 
    name: "android.hardware.health-translate-ndk",

    defaults: ["android.hardware.health-translate-ndk_defaults"],

    shared_libs: [

        "android.hardware.health-V1-ndk",

        "android.hardware.health-V2-ndk",

    ],

}
@@ -91,7 +91,7 @@ java_library { 
    name: "android.hardware.health-translate-java",

    srcs: ["android/hardware/health/Translate.java"],

    libs: [

        "android.hardware.health-V1-java",

        "android.hardware.health-V2-java",

        "android.hardware.health-V2.0-java",

        "android.hardware.health-V2.1-java",

    ],

health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/BatteryChargingPolicy.aidl

0 → 100644
+41 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.health;

@Backing(type="int") @VintfStability

enum BatteryChargingPolicy {

  INVALID = 0,

  DEFAULT = 1,

  LONG_LIFE = 2,

  ADAPTIVE = 3,

}

health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/BatteryChargingState.aidl

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2021 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.

 */

///////////////////////////////////////////////////////////////////////////////

// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

///////////////////////////////////////////////////////////////////////////////



// This file is a snapshot of an AIDL file. Do not edit it manually. There are

// two cases:

// 1). this is a frozen version file - do not edit this in any case.

// 2). this is a 'current' file. If you make a backwards compatible change to

//     the interface (from the latest frozen version), the build system will

//     prompt you to update this file with `m <name>-update-api`.

//

// You must not make a backward incompatible change to any AIDL file built

// with the aidl_interface module type with versions property set. The module

// type is used to build AIDL files in a way that they can be used across

// independently updatable components of the system. If a device is shipped

// with such a backward incompatible change, it has a high risk of breaking

// later when a module using the interface is updated, e.g., Mainline modules.



package android.hardware.health;

@Backing(type="int") @VintfStability

enum BatteryChargingState {

  INVALID = 0,

  NORMAL = 1,

  TOO_COLD = 2,

  TOO_HOT = 3,

  LONG_LIFE = 4,

  ADAPTIVE = 5,

}

health/aidl/aidl_api/android.hardware.health/current/android/hardware/health/BatteryHealth.aidl

+3 −0
Original line number Diff line number Diff line
@@ -41,4 +41,7 @@ enum BatteryHealth { 
  OVER_VOLTAGE = 5,

  UNSPECIFIED_FAILURE = 6,

  COLD = 7,

  FAIR = 8,

  NOT_AVAILABLE = 11,

  INCONSISTENT = 12,

}