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

Commit 85b3b032 authored by David Anderson's avatar David Anderson
Browse files

Add android.hardware.health AIDL HAL V3. 

Bug: 309792384
Test: m
Change-Id: I5e9183b840f523f4d5b81dec813d35983882f71d
parent 9820d5d5

compatibility_matrices/compatibility_matrix.9.xml

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

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

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

        <version>1-2</version>

        <version>3</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

health/aidl/Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ aidl_interface { 
        },



    ],

    frozen: true,

    frozen: false,



}
@@ -80,7 +80,7 @@ cc_library { 
    name: "android.hardware.health-translate-ndk",

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

    shared_libs: [

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

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

    ],

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

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

    libs: [

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

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

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

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

    ],

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

+2 −0
Original line number Diff line number Diff line
@@ -37,4 +37,6 @@ parcelable BatteryHealthData { 
  long batteryManufacturingDateSeconds;

  long batteryFirstUsageSeconds;

  long batteryStateOfHealth;

  @nullable String batterySerialNumber;

  android.hardware.health.BatteryPartStatus batteryPartStatus = android.hardware.health.BatteryPartStatus.UNSUPPORTED;

}

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

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

 * Copyright (C) 2023 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 BatteryPartStatus {

  UNSUPPORTED,

  ORIGINAL,

  REPLACED,

}

health/aidl/android/hardware/health/BatteryHealthData.aidl

+12 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.hardware.health;



import android.hardware.health.BatteryPartStatus;



/*

 * Battery health data

 */
@@ -36,4 +38,14 @@ parcelable BatteryHealthData { 
     * Otherwise, value must be in the range 0 to 100.

     */

    long batteryStateOfHealth;

    /**

     * Serial number of the battery. Null if not supported. If supported, a string of at least 6

     * alphanumeric characters. Characters may either be upper or lower case, but for comparison

     * and uniqueness purposes, must be treated as case-insensitive.

     */

    @nullable String batterySerialNumber;

    /**

     * Indicator for part originality of the battery.

     */

    BatteryPartStatus batteryPartStatus = BatteryPartStatus.UNSUPPORTED;

}