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

Commit 5dd455a5 authored by Daniel Zheng's avatar Daniel Zheng Committed by Android (Google) Code Review
Browse files

Merge "Health HAL: add hinge info" into main

parents 8afec1cf b1553a09

compatibility_matrices/compatibility_matrix.202504.xml

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

    <hal format="aidl">

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

        <version>3</version>

        <version>3-4</version>

        <interface>

            <name>IHealth</name>

            <instance>default</instance>

health/aidl/Android.bp

+3 −4
Original line number Diff line number Diff line
@@ -50,9 +50,8 @@ aidl_interface { 
            version: "3",

            imports: [],

        },



    ],

    frozen: true,

    frozen: false,



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

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

    shared_libs: [

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

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

    ],

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

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

    libs: [

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

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

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

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

    ],

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

+3 −3
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
package android.hardware.health;

@Backing(type="int") @VintfStability

enum BatteryPartStatus {

  UNSUPPORTED,

  ORIGINAL,

  REPLACED,

  UNSUPPORTED = 0,

  ORIGINAL = 1,

  REPLACED = 2,

}

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

+1 −0
Original line number Diff line number Diff line
@@ -60,5 +60,6 @@ parcelable HealthInfo { 
  android.hardware.health.BatteryChargingState chargingState;

  android.hardware.health.BatteryChargingPolicy chargingPolicy;

  @nullable android.hardware.health.BatteryHealthData batteryHealthData;

  @nullable android.hardware.health.HingeInfo[] foldInfos;

  const int BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED = (-1) /* -1 */;

}

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

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

 * Copyright (C) 2024 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;

@VintfStability

parcelable HingeInfo {

  int numTimesFolded;

  int expectedHingeLifespan;

}