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

Commit 6708bf6a authored by Benjamin Schwartz's avatar Benjamin Schwartz Committed by Android (Google) Code Review
Browse files

Merge "power/stats: Rename PowerStats HAL"

parents cb9c293a 71c6f8ba

compatibility_matrices/compatibility_matrix.current.xml

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ 
        </interface>

    </hal>

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

        <name>android.hardware.powerstats</name>

        <name>android.hardware.power.stats</name>

        <interface>

            <name>IPowerStats</name>

            <instance>default</instance>

power/stats/aidl/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -13,10 +13,10 @@ 
// limitations under the License.



aidl_interface {

    name: "android.hardware.powerstats",

    name: "android.hardware.power.stats",

    vendor_available: true,

    srcs: [

        "android/hardware/powerstats/*.aidl",

        "android/hardware/power/stats/*.aidl",

    ],

    stability: "vintf",

    backend: {

power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/ChannelInfo.aidl→power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/ChannelInfo.aidl

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
// 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.powerstats;

package android.hardware.power.stats;

@VintfStability

parcelable ChannelInfo {

  int channelId;

power/stats/aidl/aidl_api/android.hardware.powerstats/current/android/hardware/powerstats/EnergyConsumerId.aidl→power/stats/aidl/aidl_api/android.hardware.power.stats/current/android/hardware/power/stats/EnergyConsumerId.aidl

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
// 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.powerstats;

package android.hardware.power.stats;

@Backing(type="int") @VintfStability

enum EnergyConsumerId {

  DISPLAY = 0,

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

+2 −2
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ 
// 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.powerstats;

package android.hardware.power.stats;

@VintfStability

parcelable EnergyConsumerResult {

  android.hardware.powerstats.EnergyConsumerId energyConsumerId;

  android.hardware.power.stats.EnergyConsumerId energyConsumerId;

  long timestampMs;

  long energyUWs;

}