Merge "power/stats: Clean up warnings" am: dfd890a101 am: 9202d2c0a6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibf31eb2079cf63608ff344e135430cf132d821a5
This commit is contained in:
Benjamin Schwartz
2021-02-17 20:27:04 +00:00
committed by Automerger Merge Worker
2 changed files with 3 additions and 3 deletions

View File

@@ -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;
}

View File

@@ -32,10 +32,10 @@ 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
*/
@utf8InCpp String name;
}
}