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

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

Merge "power/stats: Clean up warnings" am: dfd890a1 am: 9202d2c0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf31eb2079cf63608ff344e135430cf132d821a5
parents cad4604a 9202d2c0

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

+1 −1
Original line number Diff line number Diff line
@@ -35,6 +35,6 @@ package android.hardware.power.stats; 
parcelable EnergyConsumer {

  int id;

  int ordinal;

  android.hardware.power.stats.EnergyConsumerType type;

  android.hardware.power.stats.EnergyConsumerType type = android.hardware.power.stats.EnergyConsumerType.OTHER;

  @utf8InCpp String name;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ parcelable EnergyConsumer { 
    int ordinal;



    /* Type of this EnergyConsumer */

    EnergyConsumerType type;

    EnergyConsumerType type = EnergyConsumerType.OTHER;



    /**

     * Unique name of this EnergyConsumer. Vendor/device specific. Opaque to framework