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

Commit 34340ba7 authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Automerger Merge Worker
Browse files

power/stats: Add EnergyConsumer types am: 74e09c73 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id3f67072cf9628e17e1222ed920f5851035d56dd
parents 9a139883 74e09c73

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/StateInfo.aidl→power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/Channel.aidl

+10 −9
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

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



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// 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 changes to the AIDL files built

// 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
@@ -17,7 +18,7 @@ 


package android.hardware.power.stats;

@VintfStability

parcelable StateInfo {

  int stateId;

  @utf8InCpp String stateName;

parcelable Channel {

  int id;

  @utf8InCpp String name;

}

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumer.aidl

0 → 100644
+26 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////////

// 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.power.stats;

@VintfStability

parcelable EnergyConsumer {

  int id;

  int ordinal;

  android.hardware.power.stats.EnergyConsumerType type;

  @utf8InCpp String name;

}

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerAttribution.aidl

+7 −6
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

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



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// 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 changes to the AIDL files built

// 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

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerResult.aidl

+8 −7
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

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



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// 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 changes to the AIDL files built

// 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
@@ -18,7 +19,7 @@ 
package android.hardware.power.stats;

@VintfStability

parcelable EnergyConsumerResult {

  android.hardware.power.stats.EnergyConsumerId energyConsumerId;

  int id;

  long timestampMs;

  long energyUWs;

  android.hardware.power.stats.EnergyConsumerAttribution[] attribution;

power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/PowerEntityInfo.aidl→power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerType.aidl

+11 −10
Original line number Diff line number Diff line
@@ -2,13 +2,14 @@ 
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE.                          //

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



// This file is a snapshot of an AIDL interface (or parcelable). Do not try to

// edit this file. It looks like you are doing that because you have modified

// an AIDL interface in a backward-incompatible way, e.g., deleting a function

// from an interface or a field from a parcelable and it broke the build. That

// breakage is intended.

// 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 changes to the AIDL files built

// 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
@@ -17,8 +18,8 @@ 


package android.hardware.power.stats;

@VintfStability

parcelable PowerEntityInfo {

  int powerEntityId;

  @utf8InCpp String powerEntityName;

  android.hardware.power.stats.StateInfo[] states;

enum EnergyConsumerType {

  OTHER = 0,

  CPU_CLUSTER = 1,

  DISPLAY = 2,

}