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

Commit 4a913dd6 authored by Jack Wu's avatar Jack Wu Committed by Automerger Merge Worker
Browse files

Merge "Revert "health: batteryStateOfHealth should be a property"" into udc-dev am: 1bad00b8 

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



Change-Id: I7fc264da6c6b81fe700e50f49382877782e8083c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc7ef3fc 1bad00b8

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

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

@Backing(type="int") @VintfStability

enum BatteryCapacityLevel {

  UNSUPPORTED = (-1) /* -1 */,

  UNKNOWN,

  CRITICAL,

  LOW,

  NORMAL,

  HIGH,

  FULL,

  UNSUPPORTED = -1,

  UNKNOWN = 0,

  CRITICAL = 1,

  LOW = 2,

  NORMAL = 3,

  HIGH = 4,

  FULL = 5,

}

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

+0 −1
Original line number Diff line number Diff line
@@ -36,5 +36,4 @@ package android.hardware.health; 
parcelable BatteryHealthData {

  long batteryManufacturingDateSeconds;

  long batteryFirstUsageSeconds;

  long batteryStateOfHealth;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -57,8 +57,9 @@ parcelable HealthInfo { 
  android.hardware.health.BatteryCapacityLevel batteryCapacityLevel;

  long batteryChargeTimeToFullNowSeconds;

  int batteryFullChargeDesignCapacityUah;

  int batteryStateOfHealth;

  android.hardware.health.BatteryChargingState chargingState;

  android.hardware.health.BatteryChargingPolicy chargingPolicy;

  @nullable android.hardware.health.BatteryHealthData batteryHealthData;

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

  const int BATTERY_CHARGE_TIME_TO_FULL_NOW_SECONDS_UNSUPPORTED = -1;

}

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

+0 −7
Original line number Diff line number Diff line
@@ -29,11 +29,4 @@ parcelable BatteryHealthData { 
     * The date of first usage is reported in epoch.

     */

    long batteryFirstUsageSeconds;

    /**

     * Measured battery state of health (remaining estimate full charge capacity

     * relative to the rated capacity in %).

     * Value must be 0 if batteryStatus is UNKNOWN.

     * Otherwise, value must be in the range 0 to 100.

     */

    long batteryStateOfHealth;

}

health/aidl/android/hardware/health/HealthInfo.aidl

+7 −0
Original line number Diff line number Diff line
@@ -136,6 +136,13 @@ parcelable HealthInfo { 
     * Value must be less than 100 000 000 µAh if known.

     */

    int batteryFullChargeDesignCapacityUah;

    /**

     * Measured battery state of health (remaining estimate full charge capacity

     * relative to the rated capacity in %).

     * Value must be 0 if batteryStatus is UNKNOWN.

     * Otherwise, value must be in the range 0 to 100.

     */

    int batteryStateOfHealth;

    /**

     * Battery charging state

     */